adds user model, associates user with price queries
Merge pull request #27 from lisavogtsf/master

adds user model, associates user with price queries
some changes
fix merge conflict