adding updates to master
Merge branch 'master' of github.com:shawnbro/quick_shark
added videos to topics show
some wolfram alpha stuff
saving journeys
Merge pull request #22 from kdoyne/animation

saving journeys
Merge branch 'master' of github.com:shawnbro/quick_shark
added wolfram alpha stuff
fixed youtube video, added refresh button
Merge pull request #23 from shawnbro/wolframAlpha

Wolfram alpha
working flyover panels
improved path semantics, refactored routes
more refactoring
Merge branch 'master' of github.com:shawnbro/quick_shark
complete merge
stash
beginning of journey visual
fixed merge conflict in journey_data
working updating description
working updating pictures