Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixed merge conflict
Merge pull request #1089 from bdonald25/master

Fix merge conflict and git ignore removed files specific to the ide that were not necessary to sync with git