Manually placed files worked on into this branch after it was updated
All changes to be sent to the server
Fixed an incorrect path
Clang fixes
committing changes before merging with dans fixes
resolved merge conflicts
Fixed path information after pull and merge
Merge branch 'master' of https://github.com/SCIInstitute/SCIRunGUIPrototype
reorganized tests and disabled test loading in tensor file
created regression test networks
added updated SetConductivitesToTetMesh.ui from Moritz
added conductivity parameters for skin, skull, CSG, GM, WM, and electrode
added fix for calculate gradients seg fault, tensor file still doesn't load
Merge branch 'failing_tests' of https://github.com/sfrisby/SCIRunGUIPrototype into failing_tests
Merge branch 'failing_tests'
switching computers
skin skull CSF GM WM electrode parameters linked between layers
got setConductivities back to a state that compiles
determined where the compiler was failing
should not be on master branch