"teste"
Merge remote-tracking branch 'origin/master'

Conflicts:
	volta.h
Merge remote-tracking branch 'origin/master'
"main a funcionar"
"SUP"
Merge remote-tracking branch 'origin/master'

Conflicts:
	.cproject
	volta.cpp