Rommel
Merge branch 'master' of https://github.com/maartenderaedemaeker/projecten5
Confirmationtoken
Merge branch 'master' of https://github.com/maartenderaedemaeker/projecten5

Conflicts:
	SourceFish/SourceFish/Controllers/ReservationController.cs