my last modifications
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/h4202/module3/Similarity.java
Merge branch 'master' of https://github.com/Hexanome4202/SemanticWeb