update
Merge branch 'master' of git://github.com/schimfim/ticker

Conflicts:
	config.py
Test change