bug fixin
ch
ch
Merge branch 'master' of https://github.com/kkozarev/coronalwaves
changes to yaftawave procedure, the annulus analysis procedures, and some pfss_shock debugging
Fixed conflicts and merged Kamen's branch