hotfix enviroments
Merge branch 'master' of github.com:MadeByDiesel/Music-Cloud-

Conflicts:
	config/environments/development.rb