add collabrative filtering
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from shz117/master

collaborative filtering implemented