bla
bu
Try to resolv conflict
Merge branch 'master' of https://github.com/bougoue/volpix

Conflicts:
	volpix.cbp
	volpix.depend
Merge branch 'master' of https://github.com/bougoue/volpix
Merge branch 'master' of https://github.com/bougoue/volpix