• Merge remote-tracking branch 'origin/gh-pages' into gh-pages 

    Conflicts:
	index_old.html
    Scott Griffin
    Scott Griffin committed Oct 5, 2015
    6a6aa54