Update database.yml
Added multi_json correct version to Gemfile
Removed SECRET_KEY_BASE, should be in environ variable
fixed merge
Merge pull request #40 from badnack/master

Time to move on
Removed double json in Gemfile
merged and fixed seeds
Merge branch 'development'
Merge pull request #50 from badnack/master

Time to move on master
removed vendor directory
Weird duplicates in Gemfile
adding vendor back in
added version number at bottom of about page
Added deployment scripts
Added deployment scripts
Nothing
forgot to push default pictures
Merge pull request #51 from badnack/master

forgot to push default pictures
Changed lady serving cake image to local asset.
Added lady serving cake pic...for real...