aanpassing
Merge branch 'master' of https://github.com/CalZoneVUB/Documents

Conflicts:
	SRS/main.pdf
Laatste aanpassingen SRS
Merge branch 'master' of https://github.com/CalZoneVUB/Documents
Merge branch 'FerDev'
Merge pull request #92 from fsuarezg/master

SRS update