IKE CRIT IT'S HAPPENING
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/battle_anim/bg_effect_null.png
Merge remote-tracking branch 'origin/master'