Added a Makefile
merged