created ordered items controller
kheang's pull
minor change
merge conflicts fixed
nothing important
Merge branch 'master' into kheang-master
commit
Merge branch 'master' of https://github.com/kheang/lunchpad.us into kheang-master
testing commit
Merge pull request #29 from deedeelavinder/master

account_ownership controller and tests complete
create ordered items passing, but needs refactoring
cleaned out unneeded commented code
Merge pull request #30 from nickpassarella/master

ordered item create test passing...for now
created seeds file
Merge branch 'upstream_merge'
commit before pulling master
Merge branch 'upstream_merge'
merging upstream
ordered item controller tests complete
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