added awkwardusername's name to index.html
edited from remote origin repo
added my file to repo
removed file from repo
Merge branch 'master' of github.com:kjventura/gitbasics