Configured for deployment to Heroku
init
Merge branch 'master' of https://github.com/dillonlara115/socialSpin

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/media_controller.rb