Clean up code
Merge branch 'master' of github.com:cs2103aug2014-w13-4j/main into pn-clean-up-code

Conflicts:
	src/logic/Logic.java
More adding of comments