Format thumbnails
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/bootstrap_customizations.css.scss
	db/seeds.rb
Merge remote-tracking branch 'upstream/master'
Format footer and thumbnail
Merge pull request #5 from susieye19/master

Format footer and thumbnail