added arrival support to simple combo algorithm
dealt with minor merge conflict
Merge branch 'master' of github.com:alaurenz/metrobike