c
Merge branch 'master' of https://github.com/awm4j/Asiph-Game

Conflicts:
	js/Game/Game1.js
Merge branch 'master' of https://github.com/awm4j/Asiph-Game