set up latest environment on home desktop
Merge branch 'jordan' of https://github.com/Meliis/trip-planner
markers in all places