server id deleted
Merge branch 'master' of github.com:thesashi7/stylific

Conflicts:
	tmp/pids/server.pid