Home Macine

bad sync?… maybe
Merge branch 'master' of https://github.com/luckybulldozer/server_sfm

Conflicts:
	launch_sh_server.sh
	server-sfm.lib