working on MPI
Merge branch 'master' of github.com:wme7/aero-shock

my bad :/