Encapsulating
Merge branch 'master' of https://github.com/specialeyes/scraper.git

Conflicts:
	DotABUFF Scraper/src/Driver.java