Merge branch 'master' into Board
Merge branch 'master' into Board
Board added to main game class
Fixed merge conflict in main game file
Merge pull request #17 from CactaurMan36/Board

Board in main game class