Modified tabs to look good in my editor (maybe we should talk about this)
Cleaned up code of the Player file merged in from master
Merge branch 'master' of https://github.com/Aalk4308/outpost into consumer

Conflicts:
	src/outpost/group3/Board.java
Added some code to Player.java to get starting positions for outposts assigned to a consumer formation
Merged base-infrastructure with consumer, commented out the stuff I had added to my old version of Player.java
Removed my commented code and updated tabs
Merge branch 'master' into consumer

* master:
Added theirOutposts method to Board.java
Starting to formulate basic consumer strategy
GetResources class added (errors)
Modified nearestLand() method in Board.java to check if coordinates of arguments are in bounds before passing them off as array indices (we were getting ArrayOutOfBounds exceptions)
Moved attack component of strategy into a method, since we need to call it in two places; fixed bug where the formation would remain stationary for an unneccessary turn
Fixed bug in simulator where outposts were being deleted every tick if we don't have enough resouces as opposed to 1 every season; added a hack to the simulator so if either L or W is set to 0, we can have essentially unlimited outposts
Added ability to dump Board to console by number of supportable outposts per cell
GetResources class added
Merge pull request #9 from Aalk4308/consumer

Consumer
Merge branch 'master' into get-resources

Conflicts:
	src/outpost/group3/Player.java
Merge branch 'get-resources'

* get-resources:
  GetResources class added
  GetResources class added (errors)
Merge branch 'master' into board-class-updates

* master:
  GetResources class added
  Fixed bug in simulator where outposts were being deleted every tick if we don't have enough resouces as opposed to 1 every season; added a hack to the simulator so if either L or W is set to 0, we can have essentially unlimited outposts
  Moved attack component of strategy into a method, since we need to call it in two places; fixed bug where the formation would remain stationary for an unneccessary turn
  Modified nearestLand() method in Board.java to check if coordinates of arguments are in bounds before passing them off as array indices (we were getting ArrayOutOfBounds exceptions)
  GetResources class added (errors)
  Starting to formulate basic consumer strategy
  Added theirOutposts method to Board.java
  Removed my commented code and updated tabs
  Added some code to Player.java to get starting positions for outposts assigned to a consumer formation
  Cleaned up code of the Player file merged in from master
  Modified tabs to look good in my editor (maybe we should talk about this)

Conflicts:
	src/outpost/group3/Board.java
	src/outpost/group3/Cell.java