.
.
.
.
Modified memory check function in join
.
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	bison.cu
	cm.cu