Be able to display something in the main view.
Try to resolve.
Merge branch 'master' of https://github.com/CS2103TAug2014-W15-4J/main

Conflicts:
	bin/view/MainView.fxml