Merge branch 'master' of github.com:jelder/celebrate-boston