work on registration
Merge branch '3D_buddy' of github.com:nbdanielson/sima into 3D_buddy