Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Merge branch 'master' of https://github.com/e-zhang/gutshotgames""""""""

This reverts commit 61c88ef10be7f35da6b974e61551591828b64179.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Merge branch 'master' of https://github.com/e-zhang/gutshotgames"""""""""

This reverts commit d0bbb292dbc2a19f6b486cb101f4580eae62b4ed.
Revert "Changes"

This reverts commit 213d4fb6b833d5dc41caf81a93160034f5b1e398.

Conflicts:
battleboards/BattleBoards/BattleBoards/GSGViewController.h
battleboards/BattleBoards/BattleBoards/Model/GridModel.h
battleboards/BattleBoards/BattleBoards/Views/GridView.h
battleboards/BattleBoards/BattleBoards/Views/GridView.m