Basic UI changes
Merge branch 'master' of github.com:galen0/441Assignment1

Conflicts:
	441.assignment1/bin/441.assignment1.apk
	441.assignment1/bin/classes.dex
	441.assignment1/bin/classes/edu/umich/imlc/collabrify/collabrify_dummy_app/R$id.class
	441.assignment1/bin/classes/edu/umich/imlc/collabrify/collabrify_dummy_app/R$layout.class
	441.assignment1/bin/classes/edu/umich/imlc/collabrify/collabrify_dummy_app/R$menu.class
	441.assignment1/bin/classes/edu/umich/imlc/collabrify/collabrify_dummy_app/R$string.class
	441.assignment1/bin/classes/edu/umich/imlc/collabrify/collabrify_dummy_app/R$style.class
	441.assignment1/bin/resources.ap_