dummy commit
Merge branch 'master' of git://github.com/danmichaelo/UKBot

Conflicts:
	Makefile
	README.md
	bot/POTFILES.in
moved config folder