class!!!
Merge branch 'master' of https://github.com/ej0cl6/ciao

Conflicts:
	src/1.wav
	src/2.wav
QQ