some fixes
Merge branch 'master' of https://github.com/psikon/comparativeAnalysis

Conflicts:
	graphs/test.pdf
	lib/utils.R
	scratch.R
some fixes