hotfix enviroments
hotfix artist show
Merge branch 'master' into development
hotfix gemfile
Merge pull request #6 from MadeByDiesel/development

Development