Update .gitignore
wtfmerge?

Merge branch 'master' of https://github.com/niekversteege/AirSocketServer