Merge remote-tracking branches 'origin/master' and 'matteos-dojo/master'

Conflicts:
	pseudo_dojo/scripts/condf.py
Merge remote-tracking branches 'origin/master' and 'matteos-dojo/master'

Conflicts:
	pseudo_dojo/scripts/condf.py
Merge remote-tracking branch 'origin/master'