Changed makefile and main.cpp