for merge
Merge branch 'master' of https://github.com/sanderej/bakeoff
fresh db
for merging
merged