First commit of code
Merge https://github.com/timothy-mcroy/Project-4