gallery formatted
Merge branch 'master' of https://github.com/avstruck/simba

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/pieces/show.html.erb