Update .gitignore
Merge branch 'master' of https://github.com/Joshua-F/Socket.IO-Java-Client

Conflicts:
	.gitignore