fixed undo

undo now goes through parser 2
Merge branch 'master' of https://github.com/cs2103aug2014-f11-3j/main

Conflicts:
	log
Merge branch 'master' of https://github.com/cs2103aug2014-f11-3j/main

Conflicts:
	log