added a button to genre browsing in home#index
moved beer_genres/:id/beers to beer routes
merged with master
added user feature spec and preliminary user controller spec
Merge pull request #72 from fence-lizards-2014/route_fixing

moved beer_genres/:id/beers to beer routes
Merge pull request #73 from fence-lizards-2014/rspec_users

added user feature spec and preliminary user controller spec
Resolve merge conflict in index.html header

Conflicts:
Yuzu's new button to browse all beer styles conflicted with
Devin's relocation of the header elements to the layout.html.erb

This is an open design question as to where they should live but
it's all ok for now