Updated gitignore
xMerge branch 'master' into iris