fix
Merge branch 'master' of github.com:skcho/zooberry

Conflicts:
	src/domain/arrayBlk.ml