first commit
revert
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/static_pages/gallery.html.erb