Updated gitignore
Github for windows stop complaining ffs
Merge remote-tracking branch 'origin/master'

Conflicts:
	steamchat/steamchat-steamchat.iml