Merge branch 'master' into peith
Renamed index.php to index.html
Merge pull request #1 from PeithVergil/peith

Peith