Minor changes
Merge branch 'master' of https://github.com/cs2103aug2014-t15-1j/main

Conflicts:
	src/GUI/ResultGenerator.java
Merge branch 'master' of https://github.com/cs2103aug2014-t15-1j/main