customNames as a configuration
Merge branch 'master' of github.com:cremalab/holidays-game

Conflicts:
	app/controllers/game_controller.coffee