Updating users
Merge branch 'master' of github.com:aschmi/sample_app

Due to some complications in my local development environments (laptop
 10 change) I chcked out severl workspaces and messed up the git
process.