Oops, didn't mean to push that last one
Oh ffs
Merge branch 'master' of github.com:KittyTristy/scrib

Conflicts:
	chat.py
Repo was being a derp.. all sorted now