local commit
Merge branch 'master' of github.com:simnova/task-manager

Conflicts:
	TeamTest.txt