latest beer files
Merge branch 'master' of github.com:corbanb/beerthing

Conflicts:
	App/public/stylesheets/style.css