removed arguments from chat
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
Merge branch 'master' of https://github.com/yonie90/P2PChat
some fixez