Changed tgmath to cmath and changed Visual Studio files
merge confilcts fixed