12/19kobayashi

update seafirefly
12/19kobayashi

update seafirefly
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba
Merge pull request #44 from kobayashimega/MegaKoba

Mega koba
confrict fix

confrict fix
delete BG

aa
confrict fix

confrict fix
Confrict fix

Confrict fix
Titlre  Result fix

Titlre  Result fix
Merge branch 'b_setuko' of https://github.com/setu15/FishLight into b_setuko

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.