Modified code to make the activityMain the surfaceview
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheFlyer/bin/TheFlyer.apk
	TheFlyer/bin/classes.dex
	TheFlyer/bin/classes/edu/msmith/theflyer/GameImage.class
	TheFlyer/bin/classes/edu/msmith/theflyer/MainActivity.class
	TheFlyer/bin/classes/edu/msmith/theflyer/R$drawable.class
	TheFlyer/bin/classes/edu/msmith/theflyer/R$id.class
	TheFlyer/bin/classes/edu/msmith/theflyer/R$layout.class
	TheFlyer/bin/classes/edu/msmith/theflyer/R$menu.class
	TheFlyer/bin/classes/edu/msmith/theflyer/R$raw.class
	TheFlyer/bin/classes/edu/msmith/theflyer/R$string.class
	TheFlyer/bin/classes/edu/msmith/theflyer/R$style.class
	TheFlyer/bin/classes/edu/msmith/theflyer/TestClass1.class
	TheFlyer/bin/resources.ap_
	TheFlyer/gen/edu/msmith/theflyer/R.java
	TheFlyer/src/edu/msmith/theflyer/GameImage.java
	TheFlyer/src/edu/msmith/theflyer/MainActivity.java
	TheFlyer/src/edu/msmith/theflyer/TestClass1.java