update configuration
Merge branch 'master' of github.com:o4tuna/learn-rails

Conflicts:
	config/secrets.yml