minor merge
Merge branch 'master' of
https://github.com/cs2103aug2014-w14-3j/main.git

Conflicts:
	src/controller/ControllerClass.java