made it update on search
Merge branch 'master' of https://github.com/alixander/thorne_hackathon into 08-23b

stuff
json stuff
merge conflict
Merge branch 'master' of https://github.com/alixander/thorne_hackathon into 08-23b

JSON parsing
overlay
Merge branch 'master' of https://github.com/alixander/thorne_hackathon into 08-23b

overlay
search terms