for merge
Merge branch 'master' of github.com:mouda/LinkPrediction

Conflicts:
	src/Makefile
update