added some entries to .gitignore
Merge branch 'master' into opengl
Merge branch 'opengl' into opengl-ssl