Update to most recent version
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/a00807017/thinkfast/MyGame.java
Update to most recent version