hi commiting the latest changes
Merge branch 'master' of https://github.com/simnova/task-manager

Conflicts:
	TeamTest.txt
Merge branch 'master' of https://github.com/simnova/task-manager

Conflicts:
	TeamTest.txt
Merge branch 'master' of https://github.com/simnova/task-manager

Conflicts:
	TeamTest.txt
Merge branch 'master' of https://github.com/simnova/task-manager

Conflicts:
	TeamTest.txt