commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/WrackAMole.apk
	bin/classes.dex
	bin/classes/com/example/wrackamole/Game.class
	bin/classes/com/example/wrackamole/MainActivity$1.class
	bin/classes/com/example/wrackamole/MainActivity$2.class
	bin/classes/com/example/wrackamole/MainActivity$3.class
	bin/classes/com/example/wrackamole/MainActivity$4.class
	bin/classes/com/example/wrackamole/MainActivity.class
	bin/classes/com/example/wrackamole/MainMenu$1.class
	bin/classes/com/example/wrackamole/MainMenu$2.class
	bin/classes/com/example/wrackamole/MainMenu$3.class
	bin/classes/com/example/wrackamole/MainMenu.class
	bin/classes/com/example/wrackamole/MySQLiteHelper.class
	bin/classes/com/example/wrackamole/R$id.class
	bin/classes/com/example/wrackamole/R$integer.class
	bin/classes/com/example/wrackamole/R$layout.class
	bin/classes/com/example/wrackamole/R$string.class
	bin/classes/com/example/wrackamole/R$style.class
	bin/classes/com/example/wrackamole/R$styleable.class
	bin/classes/com/example/wrackamole/Score$1.class
	bin/classes/com/example/wrackamole/Score.class
	bin/resources.ap_