oluet
Merge branch 'master' of https://github.com/satukark/wadror

Conflicts:
	app/models/beer.rb