del blank
Merge branch 'master' of https://github.com/assslove/SimpleServer

Conflicts:
	work.conf
create master and some