finish pid check
Merge branch 'master' of github.com:lausser/coshsh

Conflicts:
	Changelog