Merge branch 'master' of https://github.com/rupalivohra/CS3102

Conflicts:
	TheoryProject/src/Scraper.java