fix round and guess models, use them to determine game progress
Merge branch 'master' into guess