commiting changes
Merge branch 'master' of http://github.com/joshpi/android-game

Conflicts:
	AndroidGame/bin/AndroidGame.apk
	AndroidGame/bin/resources.ap_
Merge branch 'master' of http://github.com/joshpi/android-game
Added bin/ to gitignore