Merge remote-tracking branch 'origin/updates_portfolio' into updates_portfolio

Conflicts:
	asset.rb
	portfolio.rb
Merge pull request #10 from skunath/interest_rate_calculators

Merge remote-tracking branch 'origin/updates_portfolio' into updates_por...