added more classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Thing.py
	olredux.py