changed basically nothing
Merge remote-tracking branch 'origin/master'

Conflicts:
	Scorpion.py
	olredux.py