Gemfile adjust cuz no heroku BUNDLE_WITHOUT - 2
Merge branch 'master' of github.com:AlexisMasters/gardenia

Conflicts:
	Gemfile.lock
Gemfile w/o sqlite3