fusion map on landing page
small refactor of api and santize service objects. thank you avdi.
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.
Merge branch 'master' into working-branch
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
starting on new tests
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree
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
fix merge conflicts for bryan first layout changes