assignment 6 final commit