1
right side bar updated
right side bar updated
Merge branch 'master' of
https://github.com/slc-cs-summer-research/Scheme_Preliminary

Conflicts:
	Scheme_Preliminary/res/layout/activity_box.xml
	Scheme_Preliminary/src/com/example/scheme_preliminary/boxFragment/BoxActivity.java
conflict fixed temporarily by commenting where unparse()/evaluate() is
used