collision und mouseclick
Merge branch 'master' of github.com:hypoport/hypoport-game

Conflicts:
	html/index.html