Marc's Final for Assignment 2

Finished the assignment