Phrasing/clarification edits
Merge branch 'oop' into develop
Fix merge conflict

Conflicts:
	Python/OOP/ObjectOriented1.tex