committing changes before commenting
adding Makefile after merging