MAJ 2.
Merge branch 'master' of https://github.com/spectoor/FirstStepsEgit.git

Conflicts:
	test.txt