BattleActivity Firebase Part
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/yhacks/BattleActivity.java