Di's classes
Merge branch 'master' of https://github.com/11791-04/project-team04.git