added things
Merge branch 'master' of https://github.com/just4brown/Project6

Conflicts:
	InstantMsg/src/imserver/Chat.java