fixed CBF to shot conversion
added shot2rings, resolved #33
added shot2rings, resolved #33 (for real)
Merge branch 'master' of github.com:tjlane/odin