Removed/resolved merge conflict
Merge commit 'e46e8bff5e60813572c378c6c327b70ca3ffbf14'
Merge branch 'master' of git@github.com:nubots/robocup.git into Shannon

Conflicts:
	Vision/Modules/segmentfilter.cpp

Signed-off-by: shannon <nubot@nubots-a.(none)>
Signed-off-by: shannon <nubot@nubots-a.(none)>