Merge pull request #1 from skunath/master

.
Merge pull request #2 from skunath/master

Test_data
Merge pull request #2 from skunath/master

.
Merge pull request #3 from skunath/master

pull
Merge pull request #7 from merkhofer/master

account-portfolio-asset communication
some random code stubs
added more stuff to get all the base linkages working
Merge remote-tracking branch 'origin/updates_portfolio' into updates_portfolio

Conflicts:
	asset.rb
	portfolio.rb
Merge pull request #3 from skunath/updates_portfolio

Updates portfolio
Merge pull request #4 from skunath/updates_portfolio

Updates portfolio
big changes

Updates to a number of classes.
Merge pull request #5 from skunath/updates_portfolio

big changes
Merge pull request #4 from skunath/updates_portfolio

big changes
Dividend changes

Some additions to add dividends to assists and to add the cash to the
portfolio
Merge pull request #11 from jredlinger/dividend

Dividend
Merge pull request #5 from skunath/master

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

Conflicts:
	asset.rb
	portfolio.rb
Merge pull request #6 from skunath/updates_portfolio

Merge remote-tracking branch 'origin/updates_portfolio' into updates_por...
Merge pull request #7 from asyndent/brokerage

Brokerage
Brokerage Stuff

Added some stuff to the brokerage

1. Added capacity to display account returns on a given day
2. Added capacity to display what assets the brokerage currently has

I'm not sure that I've done it in a good/intelligent way, but thought I
would commit what I have and see what the group thinks.
Merge pull request #14 from asyndent/brokerage

Brokerage