Signed-off-by: madison <madison@madisonslaptop.(none)>
Merge branch 'Madi' of git@github.com:nubots/robocup.git into Madi

Conflicts:
	Vision/Modules/GoalDetectionAlgorithms/transitionhistogramming1d.cpp

Signed-off-by: madison <madison@madisonslaptop.(none)>
Merge branch 'Madi' of git@github.com:nubots/robocup.git into Madi

Conflicts:
	Vision/Modules/GoalDetectionAlgorithms/goaldetectorhistogram.cpp

Signed-off-by: madison <madison@madisonslaptop.(none)>
Merge branch 'Madi' of git@github.com:nubots/robocup.git into Madi
Signed-off-by: madison <madison@madisonslaptop.(none)>