-content
Merge branch 'master' of https://github.com/samuelmolinski/miniature-octo-archer

Conflicts:
	.gitignore
_painel, marcador
-delete sublime
Merge branch 'master' of https://github.com/samuelmolinski/miniature-octo-archer

Conflicts:
	wp-content/themes/atlantes/assets/css/content.css