Revert "Delete .gitignore to resolve conflicts"

This reverts commit 9640ae656447070a81065ac05c3fbbb430c1ac43.
Revert "Update .gitignore"

This reverts commit 07bcdc9a62bc993b74ff4d2f8d32be5751340e0f.