Completed Assignment 2 to specifications