pushing my stuff
Merge branch 'master' of https://github.com/jried31/SSWS

Conflicts:
	SensiteKB/data/crawl/root/frontier/00000000.jdb
	SensiteKB/src/edu/ucla/cs218/crawler/AssociationJaccardCrawler.java
	SensiteKB/src/edu/ucla/cs218/crawler/JaccardIndex.java