test conflict
Merge branch 'master' of github.com:danielribeirosilva/test

Conflicts:
	a.txt