Merge remote-tracking branch 'origin/master'

Conflicts:
	Zombie Game/src/baselayout/Map.java
Merge remote-tracking branch 'origin/master'
Basic networking steps
Basic networking steps
MiniMap!!!
Another GameInfo Panel
Some slight changes to Animations and controls that make it more
responsive and adequate
Smoothened animations and controls some more. Refresh rate is a lot
higher now.
omygosh you guys should run it now. I has awesome zermbie!
created enum for human and zombies "SpriteSheets"
Added Diagonal movement on Zombie.
Tweaked getPlayerID, configured Map to handle updates, reformatted network classes.
Merge remote-tracking branch 'origin/master'
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
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