commit before merge
Conflict in training scoring function resolved, conference presentation created. #49