init2
Merge branch 'master' of https://github.com/avotx3/game

Conflicts:
	index.html
Correct merge