Updated gitignore
gMerge branch 'master' into kevin