BUILD EVENTS
Merge branch 'master' of github.com:krakencalamari/clmath

Conflicts:
	clmath/clmath.vcxproj