implemented game rules and logic and the protocols that support this
fixed merge conflict in python protocol. Need to change the protocol numbers in scala as well
Merge pull request #43 from ahlen/master

Fixed merge conflict in #41