Signed-off-by: Archimedyz <awais1994@hotmail.com>
Merge branch 'master' of https://github.com/Archimedyz/COMP354_Scraping_4.git

Conflicts:
	workspace/.metadata/.log
	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
Signed-off-by: Archimedyz <awais1994@hotmail.com>