delted controller
resovling conflicts
Merge branch 'master' of https://github.com/cs2103aug2014-t17-1j/main

Conflicts:
	src/Parser/MainCommandHandler.java
	src/Parser/Parser.java
resolve conflict of space line in parser