local changes
Merge branch 'master' of github.com:bkanuka/pytasks

Conflicts:
	pytasks.py