Adding chat window

Need to commit in order to sync with Noah
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath