Merge branch 'model' of C:\Users\Mathias\git\Model with conflicts.
Merge remote-tracking branch 'origin/model' into model

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/model' into model
Merge remote-tracking branch 'origin/model' into model
Merge branch 'model' of C:\Users\Mathias\git\Model with conflicts.
Delete Branch