dglunz/dinner_dash — pull request #17 by bayendor (2014-11-18 15:32:04+00:00)
Title: Fix merge conflicts for user / address models

Run bundle update, rake db:migrate then rspec to make sure update was complete.