Updating gitignore file
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from davicompu/master

Updating gitignore file
Merge branch 'master' of github.com:chrisjsherm/FacSal
Merge branch 'dev' into user
Re-run .gitignore.