Changes made by Alexandra
Merge branch 'master' of https://github.com/kland/multitask

Conflicts:
	R/MultitaskFunctions-Linear.R
	src/multitask.h

Merge Karl's changes (origin/master) with Alexandra's