Merge branch 'Assignment-1'
Merge branch 'master' of https://github.com/jackbatzner/COEN-4995