Merge branch 'master' of https://github.com/in6mobile/teste01

Conflicts:
	teste.txt
Merge branch 'master' of https://github.com/in6mobile/teste01

Conflicts:
	teste.txt
Merge branch 'master' of https://github.com/in6mobile/teste01