Programming assignment 3

Both functions finished and ready to go to the peer assessment.