Subindo o settings para o servidor
Merge branch 'master' of https://github.com/Gpzim98/loja

Conflicts:
	.gitignore
Subindo o settings