Change .gitignore
Change .gitignore
Merge branch 'master' of https://github.com/adrianmm44/Zcale

Conflicts:
	.gitignore