changed
Merge branch 'master' of https://github.com/jechlin001/nagios

Conflicts:
	objects/commands.cfg