Init undo functionality added
merge conflight
merge conflicts
Undo and redo technically work

Only issue currently is when either button is pressed twice the action
is undone.
Changed some syntax
Merge branch 'master' into Sumedha

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
	src/edu/umich/penning/MainActivity.java
Undo/Redo buttons are working properly
Merge branch 'Sumedha'