test 2
Merge https://github.com/senquevila/test

Conflicts:
	a.txt