updated gitignore
Merge branch 'chris'