途中経過
Merge branch 'master' of https://github.com/kyorop/KwsRogueLike

Conflicts:
	KwsRogueLike/KwsRogueLike/PlayerBase.cpp