CPP added
Merge branch 'master' of github.com:michbur/chipPCR

Conflicts:
	R/plotCurves.R
merged