pre pull commit and push
Merge origin/master

Conflicts:
	src/survivalist/control/GameControl.java
	src/survivalist/control/MapControl.java
	src/survivalist/model/Npc.java
Merge origin/master

Conflicts:
	src/survivalist/control/GameControl.java
	src/survivalist/control/MapControl.java
	src/survivalist/model/Npc.java