more stuff
Merge branch 'master' of https://github.com/lunkpeter/MarketAnalysisTemp
stuff