refactor
Merge branch 'master' of https://github.com/Quietghost/NinjaGame.git

Conflicts:
	ninja-game-prototype/src/com/me/ninja_game_prototype/NinjaGamePrototype.java
	ninja-game-prototype/src/com/me/ninja_game_prototype/model/Entity.java
	ninja-game-prototype/src/com/me/ninja_game_prototype/model/MovableEntity.java
	ninja-game-prototype/src/com/me/ninja_game_prototype/screens/EndScreen.java
	ninja-game-prototype/src/com/me/ninja_game_prototype/screens/GameScreen.java
	ninja-game-prototype/src/com/me/ninja_game_prototype/screens/SplashScreen.java