changed
Merge branch 'master' of https://github.com/Chino503/gitTest

Conflicts:
	index.html