ビルドを通るようにした
Merge branch 'master' of https://github.com/kyorop/KwsRogueLike

Conflicts:
	KwsRogueLike/KwsRogueLike/CharacterBase.cpp
	KwsRogueLike/KwsRogueLike/EnemyBase.cpp
	KwsRogueLike/KwsRogueLike/EnemyBase.h
	KwsRogueLike/KwsRogueLike/KwsRogueLike.vcxproj
	KwsRogueLike/KwsRogueLike/KwsRogueLike.vcxproj.filters
	KwsRogueLike/KwsRogueLike/PlayerBase.cpp
	KwsRogueLike/KwsRogueLike/PlayerBase.h
マージ後の調整