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