reconciling
Merge branch 'master' of https://github.com/nicholalexander/project2
merge conflicts
fixed user_id passing
Merge pull request #21 from nicholalexander/useridPassing

Userid passing