assignment 7
Merge branch 'master' of https://github.com/dramsay9/MAS500