update gitignore and fix MIME type PDF
fix merge conflict
Merge pull request #31 from nealcpeters/pdf

Pdf