Initial commit, with fixed gitignore
Merge remote-tracking branch 'gh_cpp/master'