added user model
merging
Merge branch 'master' of github.com:cstewa/Oceanic_FellowshipInc
Merge branch 'master' of github.com:cstewa/Oceanic_FellowshipInc