add threadfix-cli jar to local project repo with exception in gitignore
Merge remote-tracking branch 'upstream/master'