adding updates to master
Merge branch 'master' of github.com:shawnbro/quick_shark
saving journeys
Merge pull request #22 from kdoyne/animation

saving journeys
Merge branch 'master' of github.com:shawnbro/quick_shark
Merge pull request #23 from shawnbro/wolframAlpha

Wolfram alpha
improved path semantics, refactored routes
more refactoring
Merge branch 'master' of github.com:shawnbro/quick_shark
complete merge
merge conflict fixed