UI to display controller
Merge branch 'daryl-ui' of https://github.com/cs2103aug2014-w14-1j/main into daryl-ui

Conflicts:
	src/UI.java