cant interrupt jump with an attack
Merge branch 'master' of https://github.com/Franjoo/Game

Conflicts:
	GameDemo/src/com/angrynerds/gameobjects/Player.java
Merge branch 'master' of https://github.com/Franjoo/Game