heroku assets
Merge branch 'master' into working_branch
Merge pull request #70 from eugenefilimonov/working_branch

Working branch/heroku assets