moved game logic to model and refactored form
fixed merge conflicts