attempt to merge 7
Merge branch 'master' of https://github.com/saltandbeer/theweekend