merge
beer show page styling and index edits
merge conflicts