Added names and fixed several TODO:s

You must still add what you contributed with during the project
Merge branch 'master' of github.com:jonac/AI_project