updated version of my tasks
Merge remote-tracking branch 'origin/master'

Conflicts:
	pythonTest.py