Laurel edit!
Merge branch 'master' of https://github.com/marknach/demon

Conflicts:
	README.txt

Laurel edit