Fix last commit
Merge branch 'master' of github.com:greglo/StackGame