Initial commit
add a.txt
Merge branch 'master' of https://git.oschina.net/diyyf/https
已删除        a.txt
已增加        New Text Document.txt
已增加        index.html
已增加        u.js
Merge branch 'master' of https://github.com/diyyf/test

Conflicts:
	README.md