Sean's Lab 2 work
Merge pull request #27 from seanpquig/master

Sean's Lab 2 work