update
Merge pull request #10 from studiostark/master

River model has cfs data again.
new column layout
update table links to show most recent data
changes
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree
eliminate state title at top of show.html due to confusion with search functionality
Merge branch 'master' of https://github.com/ThirdAndjel/FlowFree
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree
update gemfile
merge conflicts from working-branch
resolved HEAD=== merge conflicts pagination still needs fixing
begin styling, fix pagination and make helper methods for post redirects in rivers controller.
some tests
addition of small labels to rivindex table & show table + styling works
begin creating user controller & model (using Sample app as template)
Merge branch 'master' into user-construction
fix schema merge conflict
fix gemifile merge conflict
Merge remote-tracking branch 'upstream/master' into addingtests