Form
Merge branch 'master' of https://github.com/sessionista/inmyfridge
Fixed images
Fixed merge fails