depol
Merge branch 'master' of https://github.com/tjlane/odin

Conflicts:
	src/python/xray.py
random pairs
Merge branch 'master' of https://github.com/tjlane/odin