commit to merge
merge fixed
main.cc not quite working unfortunately, keep on keeping on