Preparation to integrate gamelogic.
Branch configuration
Merge branch 'sjklein92'
Merge message. I dunno.