Matchismo - Assignment 2 Fixes

This is the final version of Assignment 2. Now working on Assignment 3