ciao
Merge branch 'master' of https://github.com/JackRaMotta/sc_digicam_64x128

Conflicts:
	Gloriainexcelsisdeo.cpp