Merge branch 'master' of https://github.com/cs2103aug2014-w11-4j/main into update_logic

Conflicts:
	src/Logic.java