Bootstrap
Fixed photo issue
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile
	app/views/artworks/index.html.erb
	app/views/artworks/show.html.erb
Merge pull request #6 from kwoodard22/bootstrap

Bootstrap