http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab/JerseyTest.git Conflicts: JerseyTest/.gitignore