Parsing short links
Merge remote-tracking branch 'origin/master'

Conflicts:
	Crawler.java
	current.dat
Parsing short links
Working version