included averaging of Hare and Puma densities, as well as some tests
Merge branch 'master' of github.com:mkawalec/pumas

Conflicts:
	include/Simulator.hpp
	include/helpers.hpp