updated config/environments/production in order to deploy to Heroku
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
HOTFIX ! move pry gem out of development group in gemfile for debug in prod (gerry)
HOTFIX ! removed debug in prod
resolve conflict in user.rb (just removed the binding.pry)
Merge branch 'development'
HITFIX - debugging set_name method in images_controller.rb
HOTFIX - debugging set_name method in images_controller.rb
HOTFIX - debugging set_name method in images_controller.rb
fixed bug with naming files (original_filename doesn't exist when using remote upoad from fb files) in images_controller.rb
cleared out uploads folder of images
conflict with deleted images in tmp folder. have deleted from dev branch.
resolved conflict with dev in set_name method in images_controller