Merge pull request #26 from lisavogtsf/master

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
fix merge conflict
Merge pull request #28 from cameronjacoby/master

some commits to fix my merge conflicts
implement full crud for users
Merge pull request #29 from cameronjacoby/master

implement full crud for users