Merge pull request #2 from smrq/master

Fixing dinner history
Merge remote-tracking branch 'upstream/master' into separate-history