new file: .gitignore
+ JetBrains 製の Java IDE「IntelliJ IDEA」の設定ファイル
error: Untracked working tree file 'foo/bar' would be overwritten by merge.
Merge pull request #1 from inouetakuya/getting-started

Getting started