Makefile finally works
Makefile conflict resolved
uh