Add Health/Economic split to StudentData

StudentData now keeps track of what was seen in each mode separately;
functions have been modified accordingly