test
Merge remote-tracking branch 'changyou/master'
signup
Merge remote-tracking branch 'changyou/master'
signup
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
Merge pull request #2 from meterler/master

login page and signup page