conflict file 2 - problem7
Merge branch 'master' of https://github.com/Icakis/WebCrawler

Conflicts:
	Problem13_WebCrawler.java
Merge + push