Base from Assignment 2 Version
Merge branch 'master' of https://github.com/mbain108/Matchismo-Phase-3