Made a continue Button
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlayButton/bin/PlayButton.apk
	PlayButton/bin/classes.dex
	PlayButton/bin/classes/android/support/v7/appcompat/R$anim.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$attr.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$bool.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$color.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$dimen.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$drawable.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$id.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$integer.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$layout.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$string.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$style.class
	PlayButton/bin/classes/android/support/v7/appcompat/R$styleable.class
	PlayButton/bin/classes/android/support/v7/appcompat/R.class
	PlayButton/bin/classes/com/example/playbutton/Activity2.class
	PlayButton/bin/classes/com/example/playbutton/MainActivity$1.class
	PlayButton/bin/classes/com/example/playbutton/MainActivity.class
	PlayButton/bin/classes/com/example/playbutton/R$anim.class
	PlayButton/bin/classes/com/example/playbutton/R$attr.class
	PlayButton/bin/classes/com/example/playbutton/R$bool.class
	PlayButton/bin/classes/com/example/playbutton/R$color.class
	PlayButton/bin/classes/com/example/playbutton/R$dimen.class
	PlayButton/bin/classes/com/example/playbutton/R$drawable.class
	PlayButton/bin/classes/com/example/playbutton/R$id.class
	PlayButton/bin/classes/com/example/playbutton/R$integer.class
	PlayButton/bin/classes/com/example/playbutton/R$layout.class
	PlayButton/bin/classes/com/example/playbutton/R$menu.class
	PlayButton/bin/classes/com/example/playbutton/R$string.class
	PlayButton/bin/classes/com/example/playbutton/R$style.class
	PlayButton/bin/classes/com/example/playbutton/R$styleable.class
	PlayButton/bin/classes/com/example/playbutton/R.class
	PlayButton/bin/jarlist.cache
	PlayButton/bin/resources.ap_
	PlayButton/gen/com/example/playbutton/R.java
	PlayButton/res/layout/activity_main.xml
	appcompat_v7/bin/android-support-v7-appcompat.jar
Merge branch 'master' of https://github.com/mdoweary/ThinkFastApp

Conflicts:
	PlayButton/bin/PlayButton.apk
	PlayButton/bin/resources.ap_