Conflicts:
	.gitignore
	CMakeLists.txt
	README.md
	daqling
	src/Modules/CMakeLists.txt
	src/Modules/New/CMakeLists.txt
	src/Modules/New/NewModule.cpp
	src/Modules/New/NewModule.hpp