building test framework
Wrote energy conservation test
Merge branch 'master' into testFramework
Energy conservation now works and makes pretty plots