Test
commit flavi
Merge branch 'master' of https://github.com/VIAUC/git-lab
Merge branch 'master' of https://github.com/VIAUC/git-lab

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