database
Merge branch 'master' of https://github.com/shawnbro/quick_shark
rewind
Merge branch 'master' of https://github.com/shawnbro/quick_shark
merged with master
user searches, it creates a topic, and shows the topic page
search query lists results on topic show page
Merge pull request #4 from shawnbro/userSearch

User search
Merge branch 'master' of https://github.com/shawnbro/quick_shark
corrected wordnik variable name
fixed api key for wordnik
user create account and log in and out
fixed routes merge error
a user can now view the header of a saved journey
freebase and flickr api added to topic_helper
Merge pull request #6 from kevinmcalear/user_can_view_saved_journeys

a user can now view the header of a saved journey
basic nav bar
updated flickr and freebase api
Merge pull request #9 from rory2988/nav_bar

basic nav bar
Merge pull request #10 from cah13/api-freebase-flickr

Api freebase flickr