test
ok
Merge branch 'master' of github.com:pamanes/cdev

Conflicts:
	COPYING.txt