Configuration file
Main game
Merge branch 'master' into Feature-1