Merged User Models
Merge pull request #48 from mikephoran/placeholder

Merged User Models -- Using only UserModel in API Folder