I cant remember, but probably more stuff to viewing controller
Merge branch 'master' of github.com:jonathanyeong/tomcat
Merge branch 'master' of github.com:jonathanyeong/tomcat
Fine, gets mail to work.
Conflicts:
	Assignment2/src/edu/unsw/comp9321/logic/BookingViewerController.java
Merge branch 'master' of github.com:jonathanyeong/tomcat

Conflicts:
	Assignment2/src/edu/unsw/comp9321/logic/BookingViewerController.java