fix user show
fix merge
bug fix
Merge branch 'master' of github.com:JurgensSmit/music_lessons