design
design
design
design
Merge branch 'master' of github.com:fetsite/fetsite

Conflicts:
	app/views/galleries/index.html.erb