minor change to student and site_generator
fixed merge conflicts