Add the build file to the gitignore
Merge branch 'master' into cmake_build