update
Merge branch 'master' of https://github.com/kmcnally26/my_wiki
update
Conflicts:
	LMN/HTTP Bridge Package Job
	LMN/Puppet/Resource_examples.txt