ch-5.4 Begin user stuff
Merge branch 'master' of github.com:BikeCrasher/sample-app