Merge pull request #47 from cs2103aug2014-t17-3j/UI

Basic UI integration.
Merge remote-tracking branch 'origin/master' into UI