vs 설정파일 조정
Merge branch 'branch_Jihyeon' of https://github.com/openuasl/openuasl-server into branch_Jihyeon

Conflicts:
	openuasl-server/openuasl-server.vcxproj
aaa
bbb
ccc
dddd
eee
Merge remote-tracking branch 'origin/branch_Jihyeon'