Initial commit

This is my initial commit in my new Git repo. It's going great so far!
add readme file
add autohtml files
update index.php
add two files
test
whatever
Merge branch 'xinruima' Add comments for testing
change title
Merge branch 'xinruima'
try to commit
now it should cause problem
resolving merge conflict
Merge https://github.com/maxinrui/auto-html