Homework 6
Merge branch 'master' of github.com:ajarrott/WSU