test

test
test

test
hadoop
hadoop tutorial
Merge pull request #7 from wfeng1982/master

hadoop adding
review Tracking Hadoop Jobs from Your Mac
update
mr指南
mapreduce 整体说明翻译完成
Merge pull request #8 from wfeng1982/master

hadoop MR指南完成2篇文章
review Hadoop Tutorial.md
review Hadoop tutorial(2)
Merge pull request #9 from kenvifire/master

advanced types and sbt
review scala: sbt.md and advanced-types.md
add coll2
Merge branch 'master' of github.com:kenvifire/ImportNew
Merge remote-tracking branch 'upstream/master'