Merge branch 'master' of heroku.com:artsale

merging with the latest on heroku
Merge branch 'heroku/master'