update to studentgenerator
student gen update v2
studentgenerator update v3
Merge remote-tracking branch 'origin/Miguel's-Branch'
update studentgenerator and student
Merge remote-tracking branch 'origin/master' into Miguel's-Branch