Add simple user functionality
Merge branch 'master' of github.com:nickyrasch/demo_app