user model
pulled the latest
Merge https://github.com/lunchpad/lunchpad.us
merge
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
Merge pull request #30 from nickpassarella/master

ordered item create test passing...for now
commit before pulling master
Merge branch 'upstream_merge'
merging upstream