Merge branch 'Kyle's-Branch'
debugging tsqr still
Merge branch 'master' into Kyle's-Branch