Dog show
Merge branch 'master' of github.com:perronapp/perronapp

Conflicts:
	app/views/dogs/show.html.erb
Add s3 configuration