box navigation updated
navigation box updated
save temporarily
temporarily save
box activity updated
my current version of box updated
Merge branch 'master' of
https://github.com/slc-cs-summer-research/Scheme_Preliminary

Conflicts:
	Scheme_Preliminary/bin/Scheme_Preliminary.apk
	Scheme_Preliminary/bin/resources.ap_
Merge branch 'sloan'

Conflicts:
	Scheme_Preliminary/bin/Scheme_Preliminary.apk
	Scheme_Preliminary/bin/classes.dex
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/MainActivity.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$1$1.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$1.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$2$1.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$2.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$3$1.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$3.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$4$1.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$4.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity.class
	Scheme_Preliminary/bin/resources.ap_
box fragment updated
boxfragments updated
Merge branch 'master' of
https://github.com/slc-cs-summer-research/Scheme_Preliminary

Conflicts:
	Scheme_Preliminary/AndroidManifest.xml
	Scheme_Preliminary/bin/AndroidManifest.xml
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Activity_Selector.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Evaluation_Activity.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/MainActivity.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Activity.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$1.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$2.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$3.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$4$1.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity$4.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Box_Activity.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Fragment$MyListFragmentCommunicator.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Fragment.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/R$id.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/R$layout.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/R$menu.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/R$string.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/R$style.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/SchemeExpressionsAdapter.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/String_Creator.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Viewing_Activity.class
	Scheme_Preliminary/bin/classes/testing/testing.class
	Scheme_Preliminary/gen/com/example/scheme_preliminary/R.java
	Scheme_Preliminary/res/values/strings.xml
	Scheme_Preliminary/src/com/example/scheme_preliminary/Navigation_Box_Activity.java