final-ish version of mpi code
fixing things
Merge branch 'master' of https://github.com/wally800/hw4

Conflicts:
	aaa.c