first
Merge branch 'master' of https://github.com/TIMTOWTDAT/chat

Conflicts:
	chat.py
	chat.pyc
first commit