Merge branch 'omain' into refactor/package

# Conflicts:
#	.gitignore
#	src/sunbather/construct_parker.py
#	src/sunbather/convergeT_parker.py
#	src/sunbather/solveT.py
#	src/sunbather/tools.py