Revert "merge"

This reverts commit 4b6fe7231e05df9d6aed633941dff1acccd71ccf.
Revert "Revert ".gitignore""

This reverts commit fd2e1d03f066d4752fe3305883f681d431cfe573.
Revert ".gitignore"

This reverts commit 3e77987862a5ca4dbc015a835d302677ddcb3a89.