Merge pull request #46 from setu15/b_setuko

B setuko
Confrict fix 12/26

Confrict fix (Titlescenen)
xcodeproj add

xcodeproj add
Merge branch 'b_setuko' of https://github.com/setu15/FishLight into b_setuko