basic gallery
Merge branch 'master' of github.com:wangfowen/butternife-node

Conflicts:
	public/js/show.js