Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/AwesomeMarbleGame.apk
	bin/classes.dex
	bin/classes/com/example/awesomemarblegame/GameBoard.class
	bin/classes/com/example/awesomemarblegame/LevelChooser.class
	bin/classes/com/example/awesomemarblegame/MainActivity.class
	bin/classes/com/example/awesomemarblegame/SimulationView.class

W
w2
shit