Merge remote-tracking branch 'origin/jsan_master' into TD_Jstylo
Merge remote-tracking branch 'origin/jsan_master' into TD_Jstylo
Fixed bug where problem set needed to be loaded from XML to be run
properly