not confrict

goal BG titre result
BG+Title

BackGraund Title fix
Result

Result
not confrict

goal BG titre result
ref
Merge branch 'b_setuko' of https://github.com/setu15/FishLight into b_setuko

Conflicts:
	Classes/BackGraund.cpp
	Classes/Goal.cpp
	Classes/Goal.h
	Classes/MainLayer.cpp
	proj.ios_mac/FishLight.xcodeproj/project.pbxproj

proj.ios_mac/FishLight.xcodeproj/project.xcworkspace/xcuserdata/settyan.
xcuserdatad/UserInterfaceState.xcuserstate
2014/12/15 Toshikawa

Plistファイルの読み込みクラスを作成。
FishLightのDebugApkを追加しました。
2014/12/15 Toshikawa

Plistファイルの読み込みクラスを作成。
FishLightのDebugApkを追加しました。
Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into MyBranch
kobayashi 12/15

change seafirefly
kobayashi 12/15

change seafirefly
goal

add to goal
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/AggressiveSeaFireFly.cpp
	Classes/SeaFireFlyManager.cpp
Merge branch 'resulection' into b_setuko
ref
commit seafirefly

change
kobayashi 12/15

change seafirefly
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/AggressiveSeaFireFly.cpp
Merge pull request #38 from ToshikawaSeita/MyBranch

2014/12/15 Toshikawa
Merge pull request #39 from setu15/b_setuko

B setuko