Makefile

I made a simple Makefile (I'm also testing the merging process...)