First lab commit from Cherlyn
Merge branch 'master' of github.com:snwfog/comp445