merged teng's work
teng's new feature added for setup to database
merged new feature
Merge pull request #49 from Arborweave/Arborweave-master

Arborweave master