Finite element

Fixed merge conflicts from https://github.com/byuimpact/numerical_computing/pull/650.