Replaced NPC's - No more hard-coded!
Merge branch 'dev' of https://github.com/AndyBarron/CivilWar2014 into dev