add 精选
发布作品图片
Merge branch 'new' of https://github.com/gart360/Guo into new

Conflicts:
	app/views/shared/_nav.html.erb