ff
rm file
Merge branch 'v1' of github.com:zhaolei/mapreduce into v1
add new java