Di's add-on for baseline
Merge branch '4_evaluation' of https://github.com/11791-04/project-team04.git into 4_evaluation