organizandoGitignore
Merge branch 'master' of https://github.com/odraude7/ArRails.git
Traduções
Merge branch 'master' of https://github.com/odraude7/ArRails.git

Conflicts:
	.gitignore