checking for -s flag
Merge branch 'master' of github.com:dguastaf/453mond

Conflicts:
	Makefile
	log
	mond