Adding Makefile

Merging makefile with master