Merge pull request #1 from ddolsen23/dev

Merging dev into master
Fix master
Fix merge again; Update gitignore