Fixed some bugs in the crawlers and rewrote the combiner to support the new JSON format
Merge branch 'master' of https://github.com/Evestar/BS4Project