input files test a and b
Merge branch 'master' of github.com:crherma2/diffusion