_alterações
_layout
Merge branch 'master' of https://github.com/samuelmolinski/miniature-octo-archer

Conflicts:
	.gitignore