updated gitignore
Merge branch 'master', remote branch 'origin' into andrewswork
updated files