no message
Merge branch 'master' of https://github.com/ilhaoni/team9

Conflicts:
	RedoAngryRobot/RedoAngryBot-android/bin/jarlist.cache
	RedoAngryRobot/RedoAngryBot-desktop/.classpath
	RedoAngryRobot/RedoAngryBot-desktop/src/com/me/redoangrybot/Main.java
	RedoAngryRobot/RedoAngryBot/bin/com/badlydrawngames/veryangryrobots/Assets.class
	RedoAngryRobot/RedoAngryBot/src/com/badlydrawngames/veryangryrobots/Assets.java
1. To run on Android device, run VeryAngryRobotsActivity.java and change the path in Assets.java back to default.
2. To run desktop, use your own path declaration in Assets.java.
3. How about we split work? Some handle the display issue while others doing multiplayer part. After getting these done we can improve images and sounds :)
Merge branch 'master' of https://github.com/ilhaoni/team9

Conflicts:
	RedoAngryRobot/RedoAngryBot-android/bin/RedoAngryBot-android.apk
	RedoAngryRobot/RedoAngryBot-android/bin/classes.dex
	RedoAngryRobot/RedoAngryBot-android/bin/classes/com/me/redoangrybot/MainActivity.class
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-6d73096e507660a8dcb1d3cb9527b3d9.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-a5c2f13c9d9756af1cd5f904b2fda41b.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-android-808d50c51401c80fdf7279afda987933.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-android-sources-145a0b4805dfb9bfcc979133392aed99.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-android-sources-a4a96158c0d82455f1723a8d28341e68.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-android-sources-cba46b70b901dd8d1a1bb344b55e0bdd.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-lwjgl-1bb3ea2cd599106862a7e9306c7cdf7d.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-lwjgl-7de24e6a8e0da8809bbe51dc830cadd5.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-lwjgl-d5d4f2081db1d87c55804c306f48df15.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-lwjgl-sources-0581c453e9b4d099000498333a4d5b6b.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-lwjgl-sources-44f76ff972941fddfd4b1acc233703e6.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-backend-lwjgl-sources-bb34b53a62e20a2af721f253ee01d64d.jar
	RedoAngryRobot/RedoAngryBot-android/bin/dexedLibs/gdx-d7c24c6bfdfef166f201f9ab0c103fae.jar
	RedoAngryRobot/RedoAngryBot-android/bin/jarlist.cache
	RedoAngryRobot/RedoAngryBot-android/bin/resources.ap_
	RedoAngryRobot/RedoAngryBot-android/src/com/me/redoangrybot/MainActivity.java
	RedoAngryRobot/RedoAngryBot-desktop/bin/com/me/redoangrybot/Main.class
	RedoAngryRobot/RedoAngryBot/bin/com/badlydrawngames/veryangryrobots/Assets.class
	RedoAngryRobot/RedoAngryBot/src/com/badlydrawngames/veryangryrobots/Assets.java