Configure rails for heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Uncomment autoplay
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku

Conflicts:
	Gemfile
updated gemfile.lock
Use postgres everywhere