Merge branch 'Sumedha'
Merge branch 'base_file'

Just so #2 and #3 can use the same protocols
Merge branch 'master' into Sumedha

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java