created seeds file
Merge branch 'upstream_merge'
Merge pull request #31 from nickpassarella/master

Ordered Item controller tests finished
synced ordered items controller with order form on available_menu_items#query
handled conflict
Merge pull request #32 from kheang/master

bridge available menu items and ordered items
handled conflict
dropped user_id from accounts, working on account views
conclude merge
Merge pull request #34 from deedeelavinder/master

dropped user_id from accounts, working on account views
updated seeds file with account
nothing happend
removed user_id from accounts
Merge branch 'upstream_merge'
Merge pull request #33 from kheang/master

handled conflict
conflict merged
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
pulling from upstream
merged conflicts
fixed tests after nesting resources. all but one passes