got user update working
Merge branch 'master' into updatingUser

Trying to merge with master.
fixing merge....hopefully