Add Daniel to contributors, rename makefile