scaffolded
separating the server
Merge pull request #1 from kang/modularizingServer

separating the server
updating bookshelf
Merge pull request #2 from Zhang/develop

Develop