changed
Merge branch 'master' of https://github.com/axellerate/newGitTest

Conflicts:
	index.html