commit 2
Merge branch 'master' of https://github.com/radu-sover/LGit

Conflicts:
	file1.txt