update tests to match changes
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree
add tests for home page elements
add tests for search-by-river field
Merge pull request #13 from ThirdAndjel/master

Added tests for all routes and elements on home page.
Merge pull request #12 from studiostark/master

This is just a code refactor. Functionally the same.
Get front page Google map working, add page titles, add jquery-turbolinks gem, tweak site page layout
Merge pull request #14 from BryanWahlstrom/master

Get front page Google map working, add page titles, add jquery-turbolink...
disable scrolling on front page map
Merge pull request #15 from BryanWahlstrom/master

disable scrolling on front page map
start tweaking front page layout
adjustments to custom.css, app.html & index working to adjust styling
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree into Upstream-master
add logic to app/views/rivers/index.html.erb
add fonts, institute color palette, add background image, other site layout tweaks
format table and other layout tweaks
rewrite site copy, resize background image, capitalize buttons, other little tweaks
Merge pull request #16 from BryanWahlstrom/master

First round of layout changes
change wording
add content div to sign in and sign up pages