Create Makefile for logging and testing
Merge resolution