test
Merge remote-tracking branch 'changyou/master'
signup
Merge remote-tracking branch 'changyou/master'
signup
Merge pull request #1 from changyou/master

merge
login page and singup page
Merge remote-tracking branch 'changyou/master'
Delete test.html
delete useless code
Merge branch 'master' of https://github.com/meterler/xocean
Create README.md
add mailgun service configuration
seperate db init from server.js
remove Thing
add mongodb on travis-ci
Merge pull request #2 from meterler/master

login page and signup page
Create README.md
Merge pull request #2 from changyou/master

pull changyou master
优化顶部导航;