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