important comment added
Merge branch 'master' of github.com:michbur/dpcR

Conflicts:
	dpcR.Rproj