r/w
Merge branch 'master' of https://github.com/sa-spag/res

Conflicts:
	server.c
Merge branch 'master' of https://github.com/sa-spag/res

Conflicts:
	server.c