Fixes #12
Merge branch 'master' of github.com:UMBC-CMSC-331/Assignment5