Classes and Inheritance and Polymorphism Oh My!
Merge branch 'master' of https://github.com/felesmortis/QSQ

Conflicts:
	QSO.py