Fixed Makefile (all), slightly changed the commands for input, fixed minor error in autograder.cpp
autograder merge error fixed