first commit
add gitignore
fix conflict index.html