powerSpecTest
Merge branch 'master' of https://github.com/yaukwankiu/armor
testing new defaultParameters.py from 801a
merging
fixing conflicts