Merge remote-tracking branch 'origin/Refactored'

Conflicts:
	src/main/java/com/redditprog/webcrawler/App.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/redditprog/webcrawler/App.java