user model
pulled the latest
Merge https://github.com/lunchpad/lunchpad.us
merge
created ordered items controller
kheang's pull
Merge pull request #24 from kheang/master

changed availabilities to available menu items
Merge pull request #25 from kheang/master

Added available menu items controller w/ index, query, and destroy
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
account controller, tests, and some views
pulled
Merge pull request #27 from deedeelavinder/master

account controller, tests, some views
Merge pull request #26 from kheang/master

Hash from available menu items
added login/out to home page, generated account_ownerships controller
Merge pull request #28 from deedeelavinder/master

added login/out to home page, generated account_ownerships controller
account_ownership controller and tests complete
Merge pull request #29 from deedeelavinder/master

account_ownership controller and tests complete