Prettify. Disco!
Merge branch 'master' of github.com:chuwy/dnevnichok

Conflicts:
	dnevnichok/core.py
	dnevnichok/ui.py