Added secret_token.rb.original
Merge branch 'master' of https://github.com/monot/fb-template

Conflicts:
	config/initializers/secret_token.rb.original