Merge pull request #1 from shenchenyu/master

提交
test merge
complete
leo
added res
ok
2014-12-11
12.11
2014.12.11