Conflicts resolved

.coveragerc

.gitignore

CLMCservice/__init__.py

CLMCservice/tests.py

CLMCservice/utilities.py

CLMCservice/views.py

README.md

clmctest/monitoring/E2EAggregator.py

clmctest/monitoring/E2ESim.py

clmctest/monitoring/LineProtocolGenerator.py

clmctest/monitoring/conftest.py

clmctest/monitoring/test_e2eresults.py

clmctest/monitoring/test_simresults.py

development.ini

docs/aggregation.md

docs/monitoring.md

production.ini

pytest.ini

setup.py