Testing to make sure I branched correctly
Added spend and recieve methods to Player object
Yo11
Started proof of concept real-time number incrementer
Added name to README
Merge branch 'backend-dev-terrain-resource' into backend-dev-resources;
Added ResourceBuilding object and a Bank object
Added Bank and ResourceBuilding objects.
Added files
Some incremental changes, just testing to see if there are merge
conflicts
Merge branch 'backend-dev-server' of
https://stopping@github.com/gtkishi/Project-4x.git into
backend-dev-server

Conflicts:
	src/com/server/Model.java
Changed names of classes, implemented client-side simulation requests
Added turnNumber value for simulation state
Commiting so I can merge. Minimal additions
Trying to set stage for game loop
Making a overall class called GameObject that all objects in game stem
from.
Getting rid of my gameboard so I can merge (hopefully)
still trying to merge
trying...
Merge remote-tracking branch 'origin/backend-dev-terrain' into
backend-dev-agents

*Conflicts should now be resolved
Conflicts:
	src/GameBoard.java
	src/GameBoardTest.java
	src/RunGame.java
	src/entities/Building.java
	src/entities/Castle.java
	src/entities/Infantry.java
	src/entities/Player.java
	src/entities/Resource.java
	src/entities/Tile.java
	src/entities/Unit.java
Merge remote-tracking branch 'origin/backend-dev-server' into backend-dev-agents