no message
Merge branch 'master' of https://github.com/vincenz4/wedding

Conflicts:
	php/home.php