Keybord表示成功
再表示は未実装
Keybord表示成功
再表示は未実装
Merge remote-tracking branch 'origin/master' into s13006_141030_battleActivity_fix

Conflicts:
	app/src/main/java/jp/ac/it_college/std/flickfighter/BattleActivity.java
メソッド名、.gitignore修正
New changelist
.gitignore修正
delete: local.properties
Merge pull request #5 from FlickFighterGroup/s13006_141030_battleActivity_fix

S13006 141030 battle activity fix