Added a working CMakeLists.txtx
Changed project name
Deleted conflicting project file
Merge branch 'alex'