merge tagit
?
Merge branch 'coco'
修改一些文字
delete user#show edit button
delete some file
change navbar user.name button