fixes to prices and returns
merge conflicts

Merge branch 'master' of github.com:danielkrizian/rba

Conflicts:
	R/.Prices.R
	R/.Returns.R