modified:   .gitignore
	modified:   config/initializers/secret_token.rb
Merge branch 'master' of https://github.com/nennes/easy-job

Conflicts:
	config/initializers/secret_token.rb