comment out convert file
added config info to production.rb in an attempt to get images to appear on heroku
finished marketing track
merge