Add extra statuses
Merge branch 'master' of
https://github.com/cs2103aug2014-t15-4j/main.git

Conflicts:
	Magic8/src/fantasticfour/magiceight/command/AddCommand.java
	Magic8/src/fantasticfour/magiceight/command/DeleteCommand.java
	Magic8/src/fantasticfour/magiceight/command/DisplayCommand.java
	Magic8/src/fantasticfour/magiceight/command/EditCommand.java
	Magic8/src/fantasticfour/magiceight/command/OpenCommand.java
	Magic8/src/fantasticfour/magiceight/command/RedoCommand.java
	Magic8/src/fantasticfour/magiceight/command/SearchCommand.java
	Magic8/src/fantasticfour/magiceight/command/UndoCommand.java
Add Mark As Done
Merge branch 'master' of https://github.com/cs2103aug2014-t15-4j/main.git