Fix stuff
Merge branch 'master' of https://github.com/J-N/StockMarket