added first and last names to user, created registrations controller, added name fields to new and edit views for user registration
Added join table for menu items and orders
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merge with master
Merge conflicts
Merge pull request #12 from deedeelavinder/master

added fields to user model, created registrations controller, edited views to match
handled conflict
handled conflicts
Merge pull request #13 from kheang/master

Added join table for menu items and orders
created account model with basic tests
merged conflicts