Merge origin/master

Conflicts:
	ThreadingWeek3/src/Model/Crawler.java