WIP: merging w @sjfahr
Merge pull request #30 from sjfahr/master

Merge resolution + Power History problems in setup.ini
Merge branch 'master' of github.com:ImageGuidedTherapyLab/DakotaApplications
WIP: ignore this file @sjfahr create your local version
BUG: typo fix @sjfahr
Merge pull request #24 from ImageGuidedTherapyLab/master

dumpster fire