Added Christianas code and Library modifications
Merge branch 'master' of https://github.com/Kitton/CBR_project