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