minor
Merge branch 'master' of github.com:scatnet/scatnet
modified conv_sub and pad and unpad
Merge branch 'master' of github.com:scatnet/scatnet