ajeitei o q tava escrtio
Merge origin/master

Conflicts:
	web/arquivonovo.html
Merge origin/master

Conflicts:
	web/arquivonovo.html