Merge branch 'master' of https://github.com/rdelbel/reportRx

Conflicts:
	R/main.R