merge
Merge branch 'master' of github.com:kubanecxxx/delay_class

Conflicts:
	del.mk