Update gitignore
Merge origin/master? I don't even