Small Update
Small Update
Merge branch 'master' of https://github.com/sdhost/DistributedDatabase

Conflicts:
	conf.txt