add undo/redo
extra files
Merge branch 'master' of https://github.com/calebyoon/PA1

Conflicts:
	project.properties
	src/com/wewrite/MainActivity.java