Edited .gitignore
Edited:index.html
Merge branch 'master' of https://github.com/DavidODW/git_test