added breakfast
Merge branch 'master' of https://github.com/apicraft/conference-api.apicraft.org
Getting rid of merge conflict in heroku app.
Merge branch 'master' of https://github.com/apicraft/conference-api.apicraft.org
Merge branch 'master' of https://github.com/apicraft/conference-api.apicraft.org
Changed dates from 2013 year to 2014 year.