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

Conflicts:
	LMN/test.pp

 Changes to be committed:

	modified:   .DS_Store
	modified:   Bash/.DS_Store
modified:   LMN/.DS_Store
	modified:   LMN/LMN.txt
	modified:   LMN/Puppet/.DS_Store
	modified:   LMN/SKIN.txt
	deleted:    LMN_Puppet_config.txt
	modified:   Packages/.DS_Store
	modified:   Packages/YUM.txt