commit
commit
commit
commit
commit this idiot
commit
commit
commit
commit
commit
commit
final commit
Merge branch 'IM_Advanced'

Conflicts:
	src/main/java/gr/unipi/myThesis/baseTypes/SystemManager.java
	src/main/java/gr/unipi/myThesis/proprietary/Datasets.java
	src/main/java/gr/unipi/myThesis/proprietary/ProprietaryManager.java
commit
commit
Merge branch 'master' of https://github.com/panosbobos/StormThesis

Conflicts:
	src/main/java/gr/unipi/myThesis/baseTypes/MyTuple.java
	src/main/java/gr/unipi/myThesis/proprietary/Datasets.java
	src/main/java/gr/unipi/myThesis/proprietary/ProcessingModule.java
	src/main/java/gr/unipi/myThesis/proprietary/ProprietaryManager.java
	src/main/java/gr/unipi/myThesis/proprietary/algorithm1/PreProcessor1.java
	src/main/java/gr/unipi/myThesis/topology/CsvSpout.java
	src/main/java/gr/unipi/myThesis/topology/FilePersistBolt.java
	src/main/java/gr/unipi/myThesis/topology/MyTopology.java