added stats to mpi_omp
automerge
Merge branch 'master' of https://github.com/johanwikstrm/zombies