Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
remove bootstrap from css.
add time and cfs_flow back to river model. Will always update with the latest data
Merge pull request #10 from studiostark/master

River model has cfs data again.