-
Merge branch 'master' of https://github.com/Franjoo/Game

Conflicts:
	GameDemo/src/com/angrynerds/gameobjects/Enemy.java
	GameDemo/src/com/angrynerds/gameobjects/Map.java