Merge branch 'Rianne'
Merge branch 'Rianne'
small fixes
Merge branch 'master' of https://github.com/AGPDevelopment/ShouldIRun
added first version of selecting travel option
Merge branch 'master' into Rianne