#92 use config/secrets.yml, remove from GIT (and change secrets)
Merge branch 'master' into keep-a-secret

Conflicts:
	app/controllers/artist_controller.rb
Merge branch 'master' into keep-a-secret
#92 use secrets.yml on every environment
#92 add SecretKeeper (method 'secret')
#92 add api_key in .travis.yml
#92 set secret_key_base by config/environment.rb
#92 fix travis.yml
#92 resolv conflicts
Merge pull request #104 from i-d-e-a-t/keep-a-secret

Keep a secret