added index.html and info.php
Merge remote-tracking branch 'upstream/master'