misc changes
wtfmerge
Merge branch 'openmp' of https://github.com/yvdriess/qvm into openmp

Conflicts:
	quantum.h