fixed an error
error fixing
fixed merge conflict in app/scraper
fixed response error
Merge branch 'master' of https://github.com/WikiMapper/WikiViz
integrated new search method
changed d3 to iterate over number of children
fixing scraper conditions
fixing merge conflicts
commenting out alchemyapi for now
Merge pull request #56 from redwoodfavorite/master

Bypassing alchemyapi