worked on 1e
Merge remote-tracking branch 'origin/master'

Conflicts:
	computer.pyc
	homework.pyc
	person.pyc
	professor.pyc
	thing.pyc
	verbs.pyc
	wobject.pyc
pyc gone