Remove the duplicated makefile
Merge pull request #5 from mulander/master

Remove the duplicated makefile