Solving incoming conflict
Merge branch 'master' of github.com:marcusnygren/Elements
Removed old text about implementation of navier-stokes