fixing conflict
fix merge conflict
working animations, selecting text
user can view their account page
no more search bar in user account page, search bar centered on home page
user can delelete journeys
Merge pull request #19 from rory2988/user_account_page

User account page
Merge pull request #18 from kdoyne/master

Working animation
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