Working server version
Merge branch 'master' of https://github.com/hchiao/stepping-stones