Completed Programming Assignment 2

Finished implementing the functions