Merge pull request #1 from xiaojue/master

修改license，增加.gitignore