Syncing
Update from home
Updated by habnd

Merge branch 'master' of https://github.com/localperf/compfi

Conflicts:
	noma2.r