duplicate of work done on other computer
Merge branch 'master' of github.com:cbarbu/R-package-zoom

Conflicts:
	.gitignore