Merge branch 'master' of C:\Users\Maarten\Desktop\GroepD with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Andoid Registered Trips