Add Ms. Ellephanta.
Merge remote-tracking branch 'origin/master' into robert

Conflicts:
	_Debug/whistleblower.exe