more exception catching
debug line
Merge branch 'master' of github.com:ajauhri/712_project

Conflicts:
	crawler.py
Merge branch 'backup'