Teste do sinc manual!
Teste de commit

Isto n esta a funcionar bem!
Merge branch 'master' of https://github.com/Jhleite/where4now

Conflicts:
	ole.cd