mergeConflict
Merge branch 'master' of https://github.com/Choltz95/gitLab

Conflicts:
	README.md
conflictFix