some asda
Merge branch 'master' of https://github.com/prohor33/RarefiedGasSolver

Conflicts:
	src/grid_manager.cpp
	src/options.cpp