updating server database relationship
merges brian's changes
Merge pull request #7 from Zhang/develop

Develop