committed so I can pull
Merge branch 'master' of https://github.com/JoeWise/Assignment4