Final commit for asg1