Aggiunto .gitignore
Merge branch 'master' of https://github.com/Scuola247/Desktop

Conflicts:
	.gitignore

Test