progress in regression testing. Do not merge.
Regression testing
Regression nearly done
Regression test able to be merged.
Misc.
Merge branch 'master' of https://github.com/woodbury/Musha
Merge commit '83a334a4ac4cd5daba4ed3a0b1167deab263fb76'