some yo stuff
Merge branch 'master' of https://github.com/kenadia/beer-me

Conflicts:
	app.py