poging tot update
Merge remote-tracking branch 'origin/master'

Conflicts:
	IDPSpin/.idea/IDPSpin.iml
	IDPSpin/.idea/workspace.xml
	IDPSpin/spInOSLog.txt