changed the user model
Merge branch 'master' of github.com:bkiefer88/SELT_PROJECT into bitches
finished user update
finished user update
Merge branches 'master' and 'bitches'