클봇에 작업하려다가 멈춤 ㅠ.ㅠ
Merge branch 'master' of https://github.com/EXANewbie/Pro.Forest

Conflicts:
	ForestProj/Server/Server.vcxproj.filters
	ForestProj/Server/state_function.cpp
	ForestProj/Server/types.h