2nd commit

Conflicts:
index.html deleted from github.com
3rd try committing all my files