m
Merge branch 'master' of https://github.com/cursorcl/cpruebas

Conflicts:
	cpruebas.detection/res/Thumbs.db