This doesn't work. I hate css.
Merge branch 'master' of github.com:larister/SimBanker
Merge branch 'master' of github.com:larister/SimBanker

Conflicts:
	app/scripts/templates/base.template
	app/styles/main.css
Merge branch 'master' of github.com:larister/SimBanker

Conflicts:
	app/scripts/templates/base.template
BUY CDO's
Merge branch 'master' of github.com:larister/SimBanker

Conflicts:
	app/scripts/views/BaseView.js