Adjusting the initial setup a bit
Merge branch 'master' of github.com:fogus/spiel