added makefile
merged