fix take_test.sql and create grading .sql
Resolved conflicts and I think I'm RIGHT