moving and jumping
Merge branch 'master' of https://github.com/rvansoelen/Mooshely.git

Conflicts:
	Mooshely/src/Control/GameEngine.java
	Mooshely/src/Model/GameManager.java
	Mooshely/src/View/GameView.java