Merge branch 'master' of C:\Users\Sander\Desktop\GroepD with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trips/backend/backend.iml
	Trips/web/web.iml
Merge remote-tracking branch 'origin/master'
Service, LoginController, ...
Merge remote-tracking branch 'origin/master'