Merge branch 'rob-playground' of https://github.com/trylon/CPB-Paradigm
into rob-playground

Conflicts:
	EthicalAgent.py
Merge branch 'rob-playground' of https://github.com/trylon/CPB-Paradigm into rob-playground

Conflicts:
	EthicalAgent.py