check secret
set devise secret
Merge branch 'master' of github.com:vlewin/e-shop

Conflicts:
	config/initializers/secret_token.rb