website v2
Merge branch 'master' of https://github.com/swe2013hotel2/grashopper

Conflicts:
	WebContent/index.html