included final (mostly) to dos
Merge branch 'master' of https://github.com/hoppertim/Team_Project_1