Mel is making a mod to index.html
Merge branch 'master' of https://github.com/posenberg/git_tuts

Conflicts:
	index.html