Human modified?
Merge branch 'master' of github.com:WheezePuppet/poorHouse

Conflicts:
	human.h
Changed class names to capital