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

Conflicts:
	Scheme_Preliminary/bin/AndroidManifest.xml
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Activity.class
	Scheme_Preliminary/bin/classes/com/example/scheme_preliminary/Navigation_Fragment.class
	Scheme_Preliminary/src/main/Main.java