Amir's first commit; added my name
Amir's first commit; added my name
Merge branch 'mybranch' of github.com:amir-shirazi/rhel-osp-tigerteam-cubs into mybranch

Conflicts:
	completed.lab
Merge pull request #9 from amir-shirazi/mybranch

Amir's first commit; added my name
Add my name (rsmith) to file
Merge branch 'mybranch' of github.com:rismith/rhel-osp-tigerteam-cubs into mybranch

Conflicts:
	completed.lab