waterfall
Merge branch 'master' of git@github.com:wgychris/Task8.git

Conflicts:
	TravelPlan/WebContent/assets/css/style.css
	TravelPlan/WebContent/result.jsp
	TravelPlan/WebContent/viewPlan.jsp
waterfall2
Merge branch 'master' of git@github.com:wgychris/Task8.git