合并
Merge pull request #1 from evenluo/master

初次合并