updates
Merge branch 'master' of github.com:millskyle/fluid_dynamics