adds message
Merge branch 'master' of github.com:lannor/wedding
std merge
fixes