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

Conflicts:
	441.assignment1/bin/classes.dex
	441.assignment1/bin/resources.ap_
	441.assignment1/gen/edu/umich/icedDynamite/WeWrite/R.java
	441.assignment1/res/layout/activity_main.xml