Refactoring and exceptions
Merge branch 'master' of https://github.com/ShannonBolton/jsu-mcis-cs310-groupOne