Various changes.
Merge branch 'master' of https://github.com/semmypurewal/hack4food