Commiting changes
Merge branch 'master' of https://github.com/llucic/TestRep

Conflicts:
	file1.txt