gignore
Merge branch 'dev-ivan' of github.com:swish-climate-impact-assessment/swish-kepler-actors into dev-ivan

Conflicts:
	.gitignore