a couple of things
Merge branch 'user_show'
Merge branch 'master' of https://github.com/staxworks/maximilian-the-dog