Something went wrong on the last commit
Merge branch 'LinuxTest' of github.com:acronos7021/Stare into LinuxTest

Conflicts:
	StareProject/.idea/workspace.xml
	StareProject/CMDparser.cpp
	StareProject/serverv2.cpp