added index.html file
Merge branch 'master' into story-1
Merge branch 'master' of github.com:chrisdaudier/try_git

Conflicts:
	index.html