debug merging
Merge branch 'master' of github.com:MrBenderV/cronbashed

Conflicts:
	tacheron.sh