git rm
Merge branch 'develop' of https://github.com/kohachori/KillingBattle into develop

Conflicts:
gen/jp/killingbattle/R.java
Merge branch 'develop' of https://github.com/kohachori/KillingBattle into develop