Added a Cmakelist.txt
ignoring .exe
fixed merge conflicts
Merge branch 'andrey'
Merging commits to use cmake for demo