no message
Merge branch 'master' of https://github.com/tipmisle/booking

Conflicts:
	footer.php