Added a Makefile and a merge script.