Not relevant
Merge branch 'master' of https://github.com/Niggins/COMP3431-Assignment1

Conflicts:
	assign1_2013/src/nodes/detector.cpp