Add getData function
Merge resolve

Merge branch 'master' of https://github.com/prenumerant/rSCBapi

Conflicts:
	R/getData.R