Linking everything together, fixed makefile