# Conflicts:
#	CHANGELOG
#	__init__.py
#	doc/source/disk_model.rst
#	doc/source/tutorials.rst
#	dodo.py
#	galpak/__init__.py
#	galpak/__version__.py
#	galpak/api.py
#	galpak/galaxy_parameter.py
#	galpak/galaxy_parameters.py
#	galpak/galpak3d.py
#	galpak/instruments.py
#	galpak/math_utils.py
#	galpak/model_class.py
#	galpak/model_sersic3d.py
#	galpak/model_utilities.py
#	galpak/plot_utilities.py
#	tests/other/nondeterministic_test.py
#	tests/suite/galaxy_parameters_test.py
#	tests/suite/galpak3d_test.py
#	tests/suite/math_utils_test.py
#	web/page/papers.md
#	web/run.py

(cherry picked from commit 027c876e)

(cherry picked from commit e2b0062a)

(cherry picked from commit f439b7ee)

(cherry picked from commit 25995f6b)

(cherry picked from commit 6d0e1701)

(cherry picked from commit 742d3efc)