initial import
fixed config file secrettoken

Conflicts:
	config/initializers/secret_token.rb