Not necessary
Merge branch 'master' of github.com:WheezePuppet/poorHouse

Conflicts:
	Human.cpp
Merge branch 'master' of github.com:WheezePuppet/poorHouse
Funky iterator problem testing