Change port
Merge branch 'master' of https://github.com/kirberich/beerbot

Conflicts:
	beerbot.py