trying to fix commits
Fixed code, fixing conflicts

Need to make new branch for Mark's code and use Matthew's as the main
branch. esp. for FiniteDifferenceSolver.
merging