Create README.md
modfied README
adding index.html
took out readme
stuff
Update README.md
modded the readme.md
John changed the index.html
Mel is making a mod to index.html
Merge branch 'master' of https://github.com/posenberg/git_tuts

Conflicts:
	index.html
Delete #wtf.py#
adding index.html again
hi! mel is adding a new file