Getting assets into the branch

Merge branch 'julianStyles' of https://github.com/shicholas/brews_best

Conflicts:
	app/views/beers/index.html.slim
	app/views/beers/show.html.slim
	app/views/breweries/index.html.slim
Fixxing some issues
"Still fighting errors"
Merge branch 'master' of https://github.com/shicholas/brews_best