Compiler CFLAGS

Conflicts:

	Makefile