changed makefile to gcc
Merged