1
Merge branch 'master' of https://github.com/SomoplayOpenSource/test-html

Conflicts:
	index.html