哈哈哈
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/TopologyMain.java
	src/main/java/bolts/WordCounter.java
	src/main/java/bolts/WordNormalizer.java