first commit
注释
format
注释
new
new
Merge branch 'master' of https://github.com/heipacker/wordcount.git

Conflicts:
	src/org/apache/hadoop/examples/AggregateWordCount.java
	src/org/apache/hadoop/examples/LongSumReducer.java
	src/org/apache/hadoop/examples/RegexMapper.java