Merged gitignore from NFC branch into main