Changes

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

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