test
Merge branch 'master' of https://github.com/Marv-jo/GameWeek

Conflicts:
	config/config.json
	js/entree.js