modifica .gitignore
Merge branch 'master' of github.com:Seba0691/e-commerce

Conflicts:
	maste/.gitignore

conflict resolve
Merge branch 'master' of github.com:Seba0691/e-commerce

prova conflitti