about to pull
Merge branch 'master' of https://github.com/simensta/funky-fresh into reset-password
pulled successfully
ask andrea about email configurations
ask andrea about email configurations
prototypes refactored
removed helper tests
nn
change to invivation model
fixed the password constraints
Merge branch 'master' of https://github.com/simensta/funky-fresh into testing
pulled successfully
recipe icon now has tipsy text
working on recipe_helper
refactored pantry.js and item.js
merged testing
not fixed yet
Nixon merged his testing branch with master locally and is about to push to heroku
commented out binding of caller gem
commented out binding of caller gem
changed pantry image back to original
resized logged out page layout icons