Merge branch 'update-simulator-20141120' into helper-classes

Modified Board and Loc classes to use Manhattan distance in line with
latest simulator

* update-simulator-20141120:
  Updated to latest simulator

Conflicts:
	src/outpost/group3/Player.java
Merge branch 'master' into helper-classes

* master:
  Updated simulator

Conflicts:
	src/outpost/group3/Player.java
Merge pull request #4 from Aalk4308/helper-classes

Helper classes