Cancer/Neutrophile/Virus/Lymphocyte/etc...
Merge branch 'master' of https://github.com/nriviere/Pathogen

Conflicts:
	3DProjectBase.vcxproj.filters