Finished structure of main.c, updated makefile