box navigation updated;
a scheme input in main activity added;
navigation 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/classes.dex
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/MainActivity.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/Viewing_Activity.class
	Scheme_Preliminary/bin/resources.ap_
	Scheme_Preliminary/gen/com/example/scheme_preliminary/R.java
	Scheme_Preliminary/src/com/example/scheme_preliminary/MainActivity.java