Updated OO with Tests
Merge branch 'master' of https://github.com/friendlyshark/friendlyshark.github.com

Conflicts:
	Python Stuff/OO/Task.pyc
	Python Stuff/OO/TaskManager.pyc