Commit 20/01 test 2
Merge branch 'master' of https://github.com/Xaleis/RPG

Conflicts:
	web-static/js/Character.js
	web-static/js/Enemy.js
	web-static/js/Game.js
	web-static/js/Player.js
	web-static/js/Sprite.js