can make a reservation now!
Merge branch 'master' of github.com:gjq1218/ducking-octo-bugfixes

Conflicts:
	WebRoot/Leftbar.jsp
	src/struts.xml