revert changes

what happened?!
Merge branch 'master' of https://github.com/wangjoshuah/CS10PS2

Conflicts:
	EditorCommunicator.java