readme
Merge branch 'master' of github.com:xiaoyanzheng/test
add index.html
add footer
Merge branch '20140825'