added pred results
removed conflict

Merge branch 'master' of github.com:whynotyet/MOOC_dropout

Conflicts:
	paper_v1.Rnw