updates
udpates
Merge branch 'master' of https://github.com/kmcnally26/my_wiki

Conflicts:
	LMN/Puppet/Resource_examples.txt