Merge branch 'master' of github.com:cs2103aug2014-w13-4j/main into command-conditional
Remove redundant test code
Move command into models
Improve comments
Merge branch 'command-conditional' of https://github.com/cs2103aug2014-w13-4j/main

Conflicts:
	src/command/CommandParser.java
	src/tests/LogicTest.java