fix .gitignore conflict
Merge pull request #38 from iriya-ufo/fix_conflict

fix .gitignore conflict