Basic: Updated welcomes.

Signed-off-by: Jakub Novak <jakub.novak@gmail.com>
Merge branch 'master' into jn/welcomes

Signed-off-by: Jakub Novak <jakub.novak@gmail.com>

Conflicts:
	basic.py
Basic: Added channel specific welcomes.

Signed-off-by: Jakub Novak <jakub.novak@gmail.com>
Merge pull request #32 from JakubNvk/jn/welcomes

Basic: Updated welcomes.