committing before pulling nigel changes
committing before i pull nixon stuff
fixed merge conflicts
Merge branch 'development' of https://github.com/simensta/refrigeratory into accordion
ajax jquery working
changes to user invite logic, including user model method
Merge branch 'development' of github.com:simensta/refrigeratory into development
another attempt at fixing the pantry addition for new users
pushing so nigel can work on heroku
fixed merge conflict
Merge pull request #50 from simensta/accordion

pushing so nigel can work on heroku
still working with the pantry of a new user
fixed merge conflict on invite controller
Merge pull request #52 from simensta/invite-email

Invite email
nigel
Merge pull request #53 from simensta/accordion

nigel
Merge branch 'development' of https://github.com/simensta/refrigeratory into name-change
readded autofocus on item new form