-
*.pyd
Merge remote-tracking branch 'idev/master'

Conflicts:
	idev.py