Merge pull request #1 from bvotava-757/master

Test Pull Request from Brad
Upstream change - test
Update .gitignore
Merge remote-tracking branch 'upstream/master'