Added CMakeList and gigignore
Merge remote-tracking branch 'origin/master'
Corrected CMakeLists