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

updates

Conflicts:
	LMN/LMN_Puppet.txt
Merge branch 'master' of https://github.com/kmcnally26/my_wiki