Acid
Merge branch 'master' of github.com:turbox1/SN_Project

Conflicts:
	src/Stocks_Forcast/Model/stocksmodel.cpp