user show page merge error
Merge branch 'master' of github.com:NathanHo28/Biblio
taggable merge