debrief.cpp
debrief.cpp
Merge branch 'master' of https://github.com/nriviere/Pathogen

Conflicts:
	Release/3DProjectBase.log