updat
update
Merge branch 'master' of https://github.com/kmcnally26/Wiki
merge shit

Conflicts:
	Filesystem_Admin/LVM.txt
	LMN/LMN.txt
update