Merge pull request #1 from susieye19/master

Test pull request
Merge pull request #2 from susieye19/master

Changed header to orange
add category for menu items
Merge branch 'master' of github.com:alexyang21/fliporder
change paperclip settings in model definition
halfway through setting up paperclip for seeding
update gitignore for DS_Store
Merge pull request #3 from susieye19/master

Add jumbotron
move jumbotron banner to public folder
change config.serve_static_assets to true to show images in public folder
configure for seeding of external images from amazon s3
add tab view to menu page
merge susie's changes
merge changes with susie
remove some merge diff remnants
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/bootstrap_customizations.css.scss
	db/seeds.rb
implement tabbing of menu items and reorganize seeds.rb file
Merge remote-tracking branch 'upstream/master'
Format footer and thumbnail