Merge pull request #47 from Freeaqingme/gitignore