script to generate the file tree createparallelrun.py may be final now
cleaned git conflict after rebasing
merge.f90 put back into src folder
updated makefile to create dynamics executable and merging executable