Merge pull request #21 from setu15/b_setuko

BackGround
2014/11/14 Toshikawa

衝突検知リスナを制作。
11/14 add seafirefly

seafireflyクラス追加
Merge pull request #22 from ToshikawaSeita/MyBranch

2014/11/14 Toshikawa
11/14 add seafirefly

seafireflyクラス追加
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/PlayerSprite.cpp
ref player

Conflicts:
	Classes/PlayerSprite.cpp
Merge pull request #23 from kobayashimega/MegaKoba

Mega koba
add  Wave
Toshikawa

Update.
Merge pull request #24 from ToshikawaSeita/Temp

Toshikawa
お願いコミット

通ってくれ。
Merge pull request #27 from ToshikawaSeita/MyBranch

お願いコミット
add EnemyFactory(STageFactory)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/CollisionListener.cpp
add Manager...

各マネージャーの追加、バックグラウンドの変更、カメラ変更、ギミックの追加など
2nd itle proj
11_28

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

Conflicts:
	proj.win32/FishLight.sdf
	proj.win32/FishLight.v12.suo
	proj.win32/FishLight.vcxproj
	proj.win32/FishLight.vcxproj.filters
Merge pull request #28 from kobayashimega/MegaKoba

Mega koba