Added stubs for Hero class.  Commented some questions about entity.h
Merge branch 'master' of https://github.com/ProsserCJ/COMP-441---Southfall
Merge branch 'master' of https://github.com/ProsserCJ/COMP-441---Southfall

Conflicts:
	hero.cpp
	hero.h