1
Merge branch 'master' of https://github.com/RomanVolkov/Calculation_NovieStocks

Conflicts:
	Calculation_NovieStocks.userprefs
del