Removed duplicate merge
Added UNDO to the list of error locations
Removed junk lines
Removed redundant import
Merge branch 'master' of https://github.com/cs2103aug2014-t7-2/main

# By Natalie Rawle
# Via Natalie Rawle
* 'master' of https://github.com/cs2103aug2014-t7-2/main:
  refactored a little