got this commit after installin cs git plugin.
Merge branch 'master' of https://github.com/adform/Academy.DataTransfer

Conflicts:
	DataTransfer.v11.suo
Merge branch 'master' of https://github.com/adform/Academy.DataTransfer.git