.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CPP/Test/Test.sdf
	CPP/Test/Test.suo
	CPP/Test/Test.vcxproj
	CPP/Test/test.cpp
	CPP/Test/timer.h
	CPP/cholesky.h
	CPP/defs.h
	CPP/helper.h
	CPP/helperbase.h
	Ref Papers/Updating the Cholesky Factorization.pdf