profile and redid change
redistogo
edited procfile
Merge branch 'heroku'

Conflicts:
	Procfile
	config/environments/development.rb
	config/initializers/redis.rb