Updates!
Merge branch 'OMP'

Conflicts:
	constants.h
	world.cpp