NPCs finished
Merge branch 'DesignTeam' of https://github.com/InebriatedSquirrel/Seagulls into DesignTeam