Made Pairs c again
merged
Merge remote-tracking branch 'origin/pairs' into pairs

Conflicts:
	wordcount-sample/src/sample/TokenizerMapper.java