Merge branch 'master' of github.com:kissykazuya/MS

Conflicts:
	FHRS/SceneGame.m
Merge branch 'master' of github.com:kissykazuya/MS

Conflicts:
	FHRS/SceneGame.m