antes de apagar
resetando repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	siteporn/siteporn.html
	siteporn/siteporn.js