things are less broken therefore

this is a good commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	oop.py