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

Conflicts:
	analyzer/core/main.ml
Merge branch 'master' of https://github.com/skcho/zooberry