test
Merge branch 'master' of github.com:Pooya-m/chakamak

Conflicts:
	config/initializers/secret_token.rb