Merge pull request #3 from sinanzam0613/dev

うちゅうのほうそくがみだれる
update
up
update proj
2014/09/29 Toshikawa

iOS用のキャッシュ更新
add Sprite
test

test-setuko
Merge pull request #4 from setu15/setuko_ws

test
2014/10/03 Toshikawa

波紋のサンプルを作成しました。
update CSV
error ref

Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into ToshikawaSeita-MyBranch

Conflicts:
	proj.ios_mac/FishLight.xcodeproj/project.pbxproj
	proj.ios_mac/FishLight.xcodeproj/project.xcworkspace/xcshareddata/FishLight.xccheckout
Merge branch 'ToshikawaSeita-MyBranch'
2014/10/03 Toshikawa

復元テスト
Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into MyBranch

Conflicts:
	Classes/EndingLayer.cpp
	Classes/EndingLayer.h
	proj.ios_mac/FishLight.xcodeproj/project.pbxproj

proj.ios_mac/FishLight.xcodeproj/project.xcworkspace/xcuserdata/Toshikaw
aSeita.xcuserdatad/UserInterfaceState.xcuserstate
test
Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into MyBranch

Conflicts:
	Classes/EndingLayer.cpp
	Classes/EndingLayer.h
	proj.ios_mac/FishLight.xcodeproj/project.pbxproj

proj.ios_mac/FishLight.xcodeproj/project.xcworkspace/xcuserdata/Toshikaw
aSeita.xcuserdatad/UserInterfaceState.xcuserstate
Merge pull request #6 from ToshikawaSeita/MyBranch

My branch
Add_setukoLayer

Add_setukoLayer
Merge pull request #7 from setu15/master

Add_setukoLayer
add MainLayer

LayerColor