ui tweak
Merge branch 'master' of github.com:moliad/steel
update fluid-tests.r to use new fluid nomenclature