scott
Merge branch 'wssimm-scott'
Merge branch 'master' of github.com:vvaldez/rhel-osp-tigerteam-cubs

Conflicts:
	completed.lab