now returns name of user on success
Merge branch 'master' of github.com:adamreis/DANIEL-server