first commit
cont
PPL2013-CAT3-1
prepare for merge
Merge branch 'ss2012-report' into slides

Conflicts:
	OMakeroot