Merge branch 'chris_branch' of github.com:rcabral90/classcrawler into chris_branch

Conflicts:
	crawler.js
Merge branch 'chris_branch' of github.com:rcabral90/classcrawler into chris_branch

merging