updated YCM compatibility
mergeing
configured gitignore
fixed conflicts
Merge branch 'master' of https://github.com/pepi55/langTest