Merge branch 'board-class-updates' of https://github.com/Aalk4308/outpost into consumer

Conflicts:
	src/outpost/group3/Board.java
	src/outpost/group3/Player.java
Refactored some code in ConsumerStrategy
Some hacky modifications to consumer
Merge branch 'master' into consumer

Conflicts:
	src/outpost/group3/Board.java
	src/outpost/group3/Player.java
Little modifications in ConsumerStrategy
Merge branch 'master' into consumer

Conflicts:
	src/outpost/group3/Player.java
Merge branch 'general-infrastructure' into consumer
ConsumerStrategy now asks for 4 outposts from the general in Player.java; modified ConsumerStrategy to work with updated infrastructure; if the formation gets broken up in ConsumerStrategy, revert back to BUILD state until it fixes itself; added the ASSIGN state to deal with cases where the whole formation is no longer available
Merge branch 'master' into consumer
Refactored code in ConsumerStrategy and added a bunch of comments
Merge pull request #14 from Aalk4308/consumer

Consumer
Merge branch 'master' into get-resources-intelligently

* master:
  Refactored code in ConsumerStrategy and added a bunch of comments
  ConsumerStrategy now asks for 4 outposts from the general in Player.java; modified ConsumerStrategy to work with updated infrastructure; if the formation gets broken up in ConsumerStrategy, revert back to BUILD state until it fixes itself; added the ASSIGN state to deal with cases where the whole formation is no longer available
  Little modifications in ConsumerStrategy
  Some hacky modifications to consumer
  Refactored some code in ConsumerStrategy

Conflicts:
	src/outpost/group3/Player.java