testing
uploading gitignore
Merge pull request #1 from pers6303/master

testing merging