Add makefile support
Fix challenge