added a reference to favorites model
adds a link to favorite a beer. currently working but needs some adjustment when a user has already favorited a beer
minor changes to views
fixes merge conflict
merge