Development 1 task1
Dev2 task1
Merge branch 'Development1' into Development2

Conflicts:
	initialFile.txt