aa
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
User can see all the tags from the nav
add the tags file
Merge pull request #69 from caok/master

add rspec for model
Merge pull request #70 from Jael/master

显示所有tags