merge conflict
updated TODO with templateParser bug
clang-format for tests/ , improved Makefiles, toplvl Makefile now supports building libtools.a and check to run (and build) tests