Merge branch 'master' of https://github.com/ragnarekker/Ice-modelling

Conflicts:
	.idea/workspace.xml