added gitignore
Merge branch 'master' of github.com:nsmith756/coffeeholicscoffeeclub

Conflicts:
	.gitignore
added staging database
added gem 'pg'
added Gemfile.lock
moved gem 'thin' to production
temporarily disabled gem 'spree_multi_seller'
removed gem 'thin'
added gem 'spree_multi_seller'
removed database.yml
Merge branch 'new_design'

Conflicts:
	Gemfile
add Gemfile.lock without mysql
deleted .rvmrc
disabled gem 'spree_multi_seller'
deleted spree_multi_seller
added spree_multi_seller
update spree_multi_seller
update rails 3.2.15
Merge branch 'master' into new_design
disabled spree_multi_seller