Started work on task manager with thread pools
Started work on task manager with thread pools
Merge branch 'master' of https://github.com/Guntler/SDIS

Conflicts:
	SDIS proj1/src/pt/up/fe/backup/TaskManager.java