Ignore
Merge branch 'master' of https://github.com/josephkay/SiteCrawler

Conflicts:
	app/SiteCrawler/pipelines.pyc
	app/SiteCrawler/settings.py
	app/SiteCrawler/settings.pyc
	app/SiteCrawler/spiders/myfuncs.pyc
	app/graph.py
	app/testlog.log
Outputting sitemap as JSON now works.

	new file:   app/SiteCrawler/settings.py
	new file:   app/SiteCrawler/settings.pyc
	new file:   app/SiteCrawler/spiders/myfuncs.py
	new file:   app/SiteCrawler/spiders/myfuncs.pyc
	new file:   app/graph.py
	modified:   app/sitemap.json
	new file:   app/tree.html