Preparing for openmp parallelization of calc timestep
Putting in openmp for calc timestep
Merge branch 'master' of github.com:losalamos/CLAMR
Fixing README conflict

Conflicts:
	README