Picture This - game setup
Merge branch 'master' of ../stage