my
Merge branch 'master' of https://github.com/fb1502/newGitTest

Conflicts:
	index.html