from juliano
Merge branch 'master' of github.com:Julianotris/Task2

Conflicts:
	test.txt