ugh.
config.default
Merge branch 'master' of https://github.com/PC-Logix/LanteaBot.git

Conflicts:
	.gitignore
	config.default
	pom.xml