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
Background image reformatted and styled to NOT separate from lower portion of app during resize of screen
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
Merge pull request #74 from fence-lizards-2014/reformat_site_top

Background image reformatted and styled to NOT separate from lower porti...
added modal logic in js/css, to be ajaxified and have content
added migration to change beer table column from icon_url to label_url
Updated beer model to reflect column change
page scroll testing in modal, working
changed seed file to reflect changes
updated db schema
added remote true for button and binded event to it
Resolved merge conflict
Merge pull request #76 from fence-lizards-2014/modal_ajax

working on modal logic, to be ajaxified and have content
Merge pull request #78 from fence-lizards-2014/change_beer_table

Change beer table
mock ajax added and initial test working