Merge pull request #6 from kang/develop

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

Develop
pushing sql code
Merge pull request #8 from Zhang/develop

pushing sql code