cleaned up gccg, measures Mflops now. Removed cc= in MakeFile
merge fixed - hopefully