altering index as well
Merge branch 'master' of https://github.com/WesleyAbbey/gitTest

Conflicts:
	index.html