saving the user.
Merge branch 'master' of github.com:uscacm/the-matrix