Updated the makefile so that main is included in everything