commit 3b
Merge branch 'master' of https://github.com/karabill/mi-first-repo

Conflicts:
	file.txt