Commit before pull
Merge branch 'master' of https://github.com/Niggins/COMP3431-Assignment1

Conflicts:
	assign1_2013/CMakeLists.txt
	assign1_2013/src/nodes/detector.cpp
Added functionality for publishing
Merge branch 'master' of https://github.com/Niggins/COMP3431-Assignment1