modif
Merge branch 'master' of https://github.com/Eijebong/TestBranches

Conflicts:
	a.txt

lol