trying to animate
Merge branch 'master' of https://github.com/awm4j/Asiph-Game
modified animation
Merge branch 'master' of https://github.com/awm4j/Asiph-Game

Conflicts:
	js/Game/Game1.js
fixed some merging issue and added animation