base files working

much debugging still to be done
Merge branch 'master' into base_2

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
	src/edu/umich/penning/MainActivity.java
Merge branch 'base_2'