Typo fixed
README updated
merge
Merge remote-tracking branch 'upstream/master'
db.shutdownServer to README added
Merge pull request #35 from leider/master

minor updates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	start.sh