talen
Merge branch 'FerDev'
search courses toegevoegd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'FerDev'

Conflicts:
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/EnrollCourses.jsp
Merge pull request #111 from fsuarezg/master

Search Courses Toegevoegd