committing so I can merge
Merge branch 'master' of https://github.com/bra5047/psugv-500-team4

Conflicts:
	AlgoTraderSite/Portfolio.aspx