i hate Nan.
Merge branch 'master' of https://github.com/TroyShaw/ThreadsOfFury

Conflicts:
	src/PointMass.cpp