Testing conflict resolves
Merge branch 'master' of https://github.com/downcast/TheNextBigGame.git

Conflicts:
	TheFlyer/bin/TheFlyer.apk
	TheFlyer/bin/classes.dex
	TheFlyer/bin/classes/edu/msmith/theflyer/MainActivity.class
	TheFlyer/src/edu/msmith/theflyer/MainActivity.java