Merge branch 'master' into shadowswift_new

examples/main.c

examples/parameter_example.yml

src/clocks.c

src/clocks.h

src/engine.c

src/engine.h

src/parallel_io.c

src/partition.c

src/partition.h