Commit before pull
Merge branch 'master' of https://github.com/DeepBlue14/ros-integrator

Conflicts:
	build/Debug/GNU-Linux-x86/Backend.o
	build/Debug/GNU-Linux-x86/ConvertFromRosMsgs.o
	build/Debug/GNU-Linux-x86/ConvertToRosMsgs.o
	build/Debug/GNU-Linux-x86/DirectorySearcher.o
	build/Debug/GNU-Linux-x86/FileGenerator.o
	build/Debug/GNU-Linux-x86/FileStorage.o
	build/Debug/GNU-Linux-x86/InputGui.o
	build/Debug/GNU-Linux-x86/MasterGui.o
	build/Debug/GNU-Linux-x86/MessageDialog.o
	build/Debug/GNU-Linux-x86/ProgressGui.o
	build/Debug/GNU-Linux-x86/ResultsGui.o
	build/Debug/GNU-Linux-x86/SearchForMain.o
	build/Debug/GNU-Linux-x86/SensorMsgsSearcher.o
	build/Debug/GNU-Linux-x86/main.o
	build/Debug/GNU-Linux-x86/moc_InputGui.o
	build/Debug/GNU-Linux-x86/moc_MasterGui.o
	build/Debug/GNU-Linux-x86/moc_ProgressGui.o
	build/Debug/GNU-Linux-x86/moc_ResultsGui.o
	moc_InputGui.cpp
	moc_MasterGui.cpp
	moc_ProgressGui.cpp
	moc_ResultsGui.cpp
	nbproject/private/private.xml
	nbproject/qt-Debug.mk
Compiled 32-bit version