base files working

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

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
	src/edu/umich/penning/MainActivity.java
Separated insert/remove functions
Merge branch 'Sumedha'
Merge branch 'base_2'
onRemoteTextChanged() added and local changes are broadcast
Should be broadcasting correct event type on undo
Changed App Icon
balls
fixed beforeTextChanged
Merge branch 'master' of https://github.com/pramodsum/Penning

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
Merge branch 'master' into Sumedha
Revert "balls"

This reverts commit 1765e8ee0fec24d148b655b7fc062615574f499f.
Merge branch 'adam_dev'
Merge branch 'master' of https://github.com/pramodsum/Penning
Merge branch 'master' into Sumedha
Merge branch 'Sumedha'
fixed recursive stuff
Merge branch 'master' of github.com:pramodsum/Penning