undo function completed
Merge branch 'master' of https://github.com/QJiePing/cs2103aug2014-w10-2j

Conflicts:
	bin/Controller.class
	bin/OPLogic.class