database
Merge branch 'master' of https://github.com/shawnbro/quick_shark
Merge branch 'master' of https://github.com/shawnbro/quick_shark
Merge branch 'master' of https://github.com/shawnbro/quick_shark
corrected wordnik variable name
updated flickr api call:
added the guts of the graph path
Merge pull request #12 from kevinmcalear/user_can_view_saved_journeys

added the guts of the graph path
Merge pull request #11 from qiheme/updated_flickr_api

updated flickr api call
freebase description added to view with fallbacl logic for no description
Merge pull request #13 from cah13/add-freebase-to-view

freebase description added to view with fallback logic for no description
Merge pull request #14 from shawnbro/userSearch

User search
visualization sort of working
visualization merge error fix
fixed merge error
fixing conflict
working visualization tree for words and meaning etc
Merge pull request #16 from shawnbro/visualization

Visualization Tree
photo added to view page
Merge pull request #17 from cah13/add-photo-to-view

photo added to view page