rollback?
Merge branch 'poweranalysis' of https://github.com/tpobst/GHThesis into poweranalysis