Create .gitignore

Trying to ignore a bunch of conflicts with the merge