merge with changes
Merge branch 'master' of https://github.com/ellemot/havenly
merging changes