handled conflict
Merge pull request #34 from deedeelavinder/master

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

handled conflict
working on account view
Merge https://github.com/lunchpad/lunchpad.us
merging
account#update test