modified:   local_calc_precomp.cpp
	modified:   precompute_local.cpp
Merge branch 'master' of github.com:Dhole/collaborative_filtering

Conflicts:
	local_calc_precomp.cpp

	modified:   local_calc_precomp.cpp