ok
Merge branch 'master' of github.com:kayloos/parkingplan
Added some for conclusion
Solved merge conflict