Test Dima.txt
Merge branch 'master' of https://github.com/VictoriaSeryapova/GroupProjectNet14-1
Merge branch 'master' of https://github.com/VictoriaSeryapova/GroupProjectNet14-1
Add 1 string to Andrew.txt
Tro-lo-lo !
Merge remote-tracking branch 'remotes/origin/AndrewAndAlex' into DimaKostya
Merge remote-tracking branch 'remotes/origin/DimaKostya'

Conflicts:
	Dima.txt