.gitignoreを編集
Merge remote-tracking branch 'origin' into sato/ignore_fix
Merge pull request #20 from FUNPBL2014P2/sato/ignore_fix

.gitignoreを編集しました