Change to index
Merge remote-tracking branch 'origin/master' into gh-pages
Fix apache to PHP
Merge branch 'gh-pages'