Some text
Team 2 some changes
Merge branch 'master' of https://github.com/VIAUC/git-lab
More info
Merge branch 'master' of https://github.com/VIAUC/git-lab
Merge branch 'master' of https://github.com/VIAUC/git-lab

Conflicts:
	2.txt
Merge branch 'master' of https://github.com/VIAUC/git-lab