Beautiful Soup
Merge branch 'master' of https://github.com/bronan99/WikiScraper

Conflicts:
	scraper.py
	test.html