new file:   README.md
	new file:   compact.cpp
	new file:   data/t_alibaba_data.csv
	new file:   data/test
	new file:   data/train
	new file:   datainfo.h
	new file:   evaluate/evaluate.cpp
	new file:   evaluate/makefile
	new file:   evaluate/prepare_test.sh
	new file:   evaluate/sort_prediction.sh
	new file:   makefile
	new file:   postprocess/makefile
	new file:   postprocess/postprocess.cpp
	new file:   predict.cpp
	new file:   rating/linear.cpp
	new file:   rating/linear.h
	new file:   rating/makefile
	new file:   rating/rating.cpp
	new file:   report/base.eps
	new file:   report/base_f1.eps
	new file:   report/click_curve.eps
	new file:   report/makefile
	new file:   report/netflix.png
	new file:   report/openCF-report.pdf
	new file:   report/openCF-report.tex
	new file:   report/openCF-report.toc
	new file:   report/p247-karypis.pdf
	new file:   report/p285-sarwar.pdf
	new file:   report/post-proc.eps
	new file:   report/post-proc_f1.eps
	new file:   report/rating.eps
	new file:   report/rating_f1.eps
	new file:   report/row_norm.eps
	new file:   report/row_norm_f1.eps
	new file:   report/sim_compare.eps
	new file:   report/sim_compare_f1.eps
	new file:   report/sim_norm.eps
	new file:   report/sim_norm_f1.eps
	new file:   report/summing_compare.eps
	new file:   report/summing_compare_f1.eps
	new file:   similarity.cpp
	new file:   util.cpp
	new file:   util.h
Merge branch 'master' of https://github.com/harttle/OpenCF

Conflicts:
	README.md

	new file:   .gitignore
	new file:   LICENSE
	modified:   README.md