index list styles
main list styles
bump
merged with brewery info
worked on social networking styles
Trying to fixs error :(
Merge branch 'master' of https://github.com/shicholas/brews_best into julianStyles

Conflicts:
	app/views/beers/index.html.slim
	app/views/beers/show.html.slim
Almost got all the errors

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

Conflicts:
	app/views/beers/index.html.slim
Merge branch 'master' of https://github.com/shicholas/brews_best into julianStyles
Fixing mistake