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

fix .gitignore conflict
Merge commit '6d84b0e566ab637a87b22ee171a1e657a399dbe2' into PR/ex1.14