Hog: updated autograder
merge