NPC development
more npcs
Conflict: Up to you Sidd

Conflicts:
	src/ca/javajesus/game/entities/Sword.java