Added buggy collision detection with NPCs
*Note: It seems pretty good, but I got stuck once.  I will be testing this further
Merge branch 'master' of https://github.com/ProsserCJ/COMP-441---Southfall

Conflicts:
	Entity.cpp
	World.cpp
	World.h
	hero.cpp
Minor tweak in text box