testing pull requests
Merge pull request #1 from KPlanche/master

testing pull requests
Updated gitignore