modified:   .idea/misc.xml
	modified:   .idea/workspace.xml
	modified:   delta.db
	modified:   .idea/workspace.xml
	modified:   src/core/collector.py
	modified:   .idea/deltafs.iml
	modified:   .idea/misc.xml
	modified:   .idea/workspace.xml
Merge branch 'master' of http://github.com/mnothic/deltafs