added .gitignore file
Merge remote-tracking branch 'upstream/master'
rough text and changing filenames to work with latex