Game logic is now in place. I think. Please work.
Merge remote-tracking branch 'origin/master'