Game state model

Bare merger fordi vi trenger endringene i master.