I Hate Conflict Errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZombieApocalypseSimulator/Models/Characters/Character.cs