handled conflict
updated seeds file with account
removed user_id from accounts
Merge branch 'upstream_merge'
Merge pull request #33 from kheang/master

handled conflict