merge
Merge branch 'master' of github.com:anahm/catstory
merge
make game working