Added Cmake configuration
change file format
merge
merge again, the file forgat seems to bother git