g1 add yyyy
Corrigindo commit

Merge branch 'master' into pr/n2_gerrysousa

Conflicts:
	Novo Documento de Texto.txt
corrigindo commit
Merge branch 'pr/n2_gerrysousa'
Merge pull request #3 from g-emerson/master

g1 pede p/ g2 pegar dele