no message
Merge branch 'master' of https://github.com/swarly/TwiterKnowlageCenter-236700

Conflicts:
	data/myMap.ser
	src/main/java/ac/il/technion/twc/DataHandlerBySerialization.java
	src/main/java/ac/il/technion/twc/TwitterKnowledgeCenter.java
no message