Merge?
Merge branch 'master' of https://github.com/Usernamealreadynottaken/Goblin

Conflicts:
	config/initializers/secret_token.rb