Check puppet
Merge branch 'master' of https://github.com/djshirley111/Myjunk

Conflicts:
	check_puppet.py