TimeBombAdded
xml
Merge branch 'master' of https://github.com/bibe2003/FlipFlop

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/FlipFlop.apk
	bin/classes.dex
	bin/classes/edu/astate/cs/Disclaimer.class
	bin/classes/edu/astate/cs/Home.class
	bin/classes/edu/astate/cs/Instructions.class
	bin/classes/edu/astate/cs/MainActivity.class
	bin/classes/edu/astate/cs/Options.class
	bin/classes/edu/astate/cs/PlayOptions.class
	bin/classes/edu/astate/cs/R$drawable.class
	bin/classes/edu/astate/cs/R$id.class
	bin/classes/edu/astate/cs/R$layout.class
	bin/classes/edu/astate/cs/R$menu.class
	bin/classes/edu/astate/cs/R$raw.class
	bin/classes/edu/astate/cs/R$string.class
	bin/classes/edu/astate/cs/R$style.class
	bin/dexedLibs/android-support-v4-ea71f7cae736ee3671f462aa0eb2b088.jar
	bin/resources.ap_
	gen/edu/astate/cs/R.java
	res/layout/activity_options.xml
	res/layout/activity_play_options.xml
	res/values/strings.xml
	src/edu/astate/cs/Options.java
	src/edu/astate/cs/PlayOptions.java