bot work
Merge branch 'tomas'
Merge branch 'master' of https://github.com/tomaskratka/Dewlluminatibot

Conflicts:
	lib/settings.json