Conflict fix 12/26

Conflict fix Title 2
xcodeproj add

xcodeproj add
Conflict 12/26

Conflict Title 3
Merge branch 'b_setuko' of https://github.com/setu15/FishLight into b_setuko