change base M42 and add QTZ effects
Merge branch 'master' of https://github.com/loisdroug27/M42

Conflicts:
	.DS_Store