Added ENV[REDISTOGO_URL] to config/initializers/redis.rb
Fixed merge conflict in index.html.erb