Fixed wrong settings for two experiments
Merge remote-tracking branch 'origin/master'

Conflicts:
	gui/user_code.py
Py3