Grade entry

Fixed conflicts with current master, fixed errors with partials not rendering, and added tests.