Created 12 Unit Tests for Gameplay Classes
Tweaked getPlayerID, configured Map to handle updates, reformatted network classes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Zombie Game/human_topdown.png
	Zombie Game/src/baselayout/Frame.java
	Zombie Game/src/baselayout/GameInfo.java
	Zombie Game/src/baselayout/GamePanel.java
	Zombie Game/src/game/GameplayTests.java
	Zombie Game/src/game/Human.java
	Zombie Game/src/game/Map.java
	Zombie Game/src/game/Player.java
	Zombie Game/src/game/Zombie.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Zombie Game/human_topdown.png
	Zombie Game/src/baselayout/Frame.java
	Zombie Game/src/baselayout/GameInfo.java
	Zombie Game/src/baselayout/GamePanel.java
	Zombie Game/src/game/GameplayTests.java
	Zombie Game/src/game/Human.java
	Zombie Game/src/game/Map.java
	Zombie Game/src/game/Player.java
	Zombie Game/src/game/Zombie.java
Created player IDs

Modified Player class to use protected rather than private attributes
(to minimize beaning)

Added movementAmount attribute to player class to allow super zombie to
sprint
Merge remote-tracking branch 'origin/master'

Conflicts:
	Zombie Game/src/game/Human.java
	Zombie Game/src/game/Map.java
	Zombie Game/src/game/Player.java
	Zombie Game/src/game/Zombie.java
More network junk
More network junk
Merge remote-tracking branch 'origin/master'

Conflicts:
	Zombie Game/src/baselayout/GamePanel.java
	Zombie Game/src/game/Player.java
	Zombie Game/src/game/Zombie.java
Switched variables back to protected