Pull request for assignment 3 (mer567)