Changes to support openmp and not openmp timing rutines
Merge branch 'master' of https://github.com/basp-group/purify

Conflicts:
src/example_30dor.c
src/example_ami.c
src/example_m31.c
src/purify_test.c
Conflicts resolved