heroku stuff
static on heroku
static url for heroku
collectstatic in procfile
Merge remote-tracking branch 'origin/master'