added singleton so its easier to access data, as well as some more functionality in training quiz
fixed merge conflict