New hammers, formatting
Merge branch 'master' of github.com:donat-b/cottages