labels and filter
Merge branch 'master' of https://github.com/dkelley/beermenu

Conflicts:
	client/index.html