fix
Merge branch 'master' of
https://github.com/ignatevp/JEETraineeGroup1.git

Conflicts:
	ManagerAPI/.gitignore
Merge branch 'master' of https://github.com/ignatevp/JEETraineeGroup1.git