fixed conflicts
add the OMP PARALLEL region
now these versions are consistent with the doc file
added the -fopenmp flag
Merge branch 'master' of https://github.com/aarograh/EXACT-ISH