makefile to master

Finished Makefile