added
Merge branch 'master' of https://github.com/nagmeldin/ProjectManager

Conflicts:
	test.txt