Update .gitignore

Designed to ignore files in Unity that will cause problems with merges.