new column layout
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
fix schema merge conflict
fix gemifile merge conflict
Merge remote-tracking branch 'upstream/master' into addingtests
update gemfile