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

Conflicts:
	GameDemo-desktop/GameDemo-desktop.iml
	GameDemo/GameDemo.iml
	out/production/GameDemo/com/angrynerds/game/collision/Detector.class
deleted
Merge branch 'master' of https://github.com/Franjoo/Game
MainMenu tweening
main menu tweening
Merge branch 'master' of https://github.com/Franjoo/Game

Conflicts:
	GameDemo-android/GameDemo-android.iml
	GameDemo-desktop/GameDemo-desktop.iml
	GameDemo/GameDemo.iml
	GameDemo/libs/libs.iml
	GameDemo/src/com/angrynerds/gameobjects/Player.java
	out/production/GameDemo-android/GameDemo-android.apk
	out/production/GameDemo-android/GameDemo-android.unaligned.apk
	out/production/GameDemo/com/angrynerds/game/screens/mainmenu/MainMenu$MenuButtonListener.class
	out/production/GameDemo/com/angrynerds/game/screens/mainmenu/MainMenu.class
	out/production/GameDemo/com/angrynerds/gameobjects/Player$AnimationListener.class
	out/production/GameDemo/com/angrynerds/gameobjects/Player.class
main menu tweening