Add files necessary for Heroku deployment (incl. Redis)
Update Ruby version
Merge branch 'master' of https://github.com/LaunchAcademy/food_trucks into deployment_to_heroku
Update Procfile
Rename ProcFile to Procfile
Unicorn config file added
Remove . from unicorn.rb file path
Replace . in unicorn.rb file path, add Foreman
commented sidekiq functions
Locations added to seed
fixing gemfile merge conflicts
Merge pull request #50 from LaunchAcademy/deployment_to_heroku

Add files necessary for Heroku deployment (incl. Redis)
allowed admins to see sidekiq
added dependent destroy for foodtrucks and stops, set up sidekiq for heroku
Only use redis config in production
Move user pictures to show page
Fix test to reflect picture on show page
Update user_adds_avatar_on_signup_spec.rb
working on cached isses
Merge branch 'master' into votes_ajax

Conflicts:
	app/views/food_trucks/show.html.erb