My work
Merge branch 'master' of https://github.com/flwedemeyer/breakfast_app
Fix david's conflicts