Updates test.sh
Fixes merge conflict
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR
Merge branch 'master' of github.com:vincentvillani/DSPSR