delete old files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/pydeps.iml
	pydeps/tmp.html