Merge pull request #1 from aeckert2/master

update ignore for texmaker
Merge pull request #2 from aeckert2/master

commit some test text to intro
add to gitignore for testing