loca1 changed xpto
Merge branch 'master' of https://github.com/fbfreitas/LSTests

Conflicts:
	xpto2.txt