merged from development
removed github from the login options, changed the text for google sign in and added some potential background images to the assets/images folder. All functionality of Devise and Oauth is working at the moment, just need to make appropriate fields mandatory
minor changes made to the format of the login inputs. Switching back to development branch
Added username to user profile. When user logs in, they now go to portfolio index page. This shows all portfolios at the moment, not just those for the auth'd user
User ID is now displaying in the portfolio index table. Still displaying all portfolios, so not related to the specific authenticated user
added balance to portfolio
Added callback to portfolio controller to authenticate user before opening default page. CSS changes made to portfolio#index
Views now working for Stock and Portfolio
portfolio show now shows the shares contained within it - via portstock table
Added forms for portfolios, stocks and portstocks
Added portfolio values to show page. Buy share link now opens new portstock page. Still erroring on create new portfolio  though
Merge branch 'development'
Redirecting new portstock to portfolio index, so buying shares does work
added yahoo-fiance gem and bundled. Some styling has been added
can now buy and sell shares and balance updates in the portfolio
added yahoo-finance
Merge branch 'development'
ammended stock.js to gather quantity and current purchase price. Still need to calculate the trade cost and put to the screen