merge admin changes into master
latest activate changes, starting to rough in data tables for calculator and dashboard
split dashboard in to partials, filled in portfolio and transactions tables
merged tables in to develop
began adding Stocks model, integration tests, and controller.
stocks model, controller, views, outline tests hooked up and working. specificity needed with tests, issue added
merged stock
created Option model, controller, views, basic tests
merged options
form style tweaks
added glyphicons to options/show, added responsive classes to options new and edit form
merged style-layout changes
user_id required for stocks, else login_url
user_id required for options, else login_url
merge user-owned
glyphicons and responsive classes to stocks index, new, edit
merge style layout
Merge branch 'master' of https://github.com/n8rzz/myMarket into develop
glyphicons for user and session new forms
added buttons for stock/option tables