settings to make gui work
Merge branch 'master' of https://github.com/cs2103aug2014-t14-3c/main