Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Driver.java
	src/URLParser.java
	src/com/mijecu/urlparser/Driver.java
	src/com/mijecu/urlparser/URLParser.java
	src/com/mijecu25/urlparser/Driver.java
	src/com/mijecu25/urlparser/URLParser.java