フラッグ追加しました
Merge remote-tracking branch 'origin/master'

Conflicts:
	teamProject/source/CGame.cpp
	teamProject/source/CGame.h
	teamProject/teamProject.vcxproj
	teamProject/teamProject.vcxproj.filters