pull git Ignore
pull
Merge branch 'master' of https://github.com/panida/ChatTest

Conflicts:
	nbproject/private/private.xml