Resolve conflict
Merge branch 'master' of https://github.com/diogonal/paraprj.git

Conflicts:
	UndeadInfection/src/Constants.h
Change initial zombie / human distribution